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
..
Base	Merge branch '0.7.0reset' of https://github.com/uramer/openmw into 0.7.1	2020-02-11 15:41:38 +02:00
Controllers	[General] Include ScriptLocalFloat as part of ClientScriptLocal	2020-02-10 07:58:35 +02:00
Master	[General] Fix declarations hiding class members, part 2	2019-12-04 10:17:33 +02:00
Packets	Merge branch '0.7.0reset' of https://github.com/uramer/openmw into 0.7.1	2020-02-11 15:41:38 +02:00
ErrorMessages.hpp	[General] Move credits integrity error message to new ErrorMessages file	2018-07-16 03:21:14 +03:00
NetworkMessages.hpp	[General] Rename ScriptLocalShort into ClientScriptLocal	2020-02-05 17:41:48 +02:00
TimedLog.cpp	[General] Remove "created by" stamps added by IntelliJ	2019-08-26 12:33:28 +03:00
TimedLog.hpp	[General] Remove "created by" stamps added by IntelliJ	2019-08-26 12:33:28 +03:00
Utils.cpp	[General] Fix problems with Utils::getArchitectureType()	2019-03-22 03:09:11 +02:00
Utils.hpp	[General] Remove "created by" stamps added by IntelliJ	2019-08-26 12:33:28 +03:00
Version.hpp	[General] Update credits	2019-07-20 15:13:10 +03:00