David Cernat a13cef9913 Merge branch '0.7.0reset' of https://github.com/uramer/openmw into 0.7.1 ... # Conflicts: # apps/openmw-mp/Script/Functions/Worldstate.cpp # apps/openmw-mp/Script/Functions/Worldstate.hpp # apps/openmw/mwbase/world.hpp # apps/openmw/mwmp/CellController.cpp # apps/openmw/mwworld/cellstore.cpp # apps/openmw/mwworld/worldimp.cpp # apps/openmw/mwworld/worldimp.hpp		2020-02-11 15:41:38 +02:00
..
Actor	[General] Rename unused ActorInteraction into ActorSpellsActive	2020-01-26 12:47:49 +02:00
Object	[General] Include ScriptLocalFloat as part of ClientScriptLocal	2020-02-10 07:58:35 +02:00
Player	[General] Renamed unused PlayerActiveSkills into PlayerSpellsActive	2020-01-26 10:58:22 +02:00
System	[General] Fix declarations hiding class members, part 2	2019-12-04 10:17:33 +02:00
Worldstate	Merge branch '0.7.0reset' of https://github.com/uramer/openmw into 0.7.1	2020-02-11 15:41:38 +02:00
BasePacket.cpp	[General] Fix declarations hiding class members, part 2	2019-12-04 10:17:33 +02:00
BasePacket.hpp	[General] Fix declarations hiding class members, part 2	2019-12-04 10:17:33 +02:00
PacketPreInit.cpp	[General] Fix declarations hiding class members, part 2	2019-12-04 10:17:33 +02:00
PacketPreInit.hpp	[General] Fix declarations hiding class members, part 2	2019-12-04 10:17:33 +02:00