David Cernat 3f7e163c92 Merge pull request #439 from TES3MP/0.6.3 while resolving conflicts ... Conflicts: apps/openmw-mp/CMakeLists.txt apps/openmw-mp/Script/Functions/GUI.cpp apps/openmw-mp/Script/Functions/GUI.hpp apps/openmw-mp/Script/Functions/Worldstate.cpp apps/openmw-mp/Script/Functions/Worldstate.hpp apps/openmw-mp/processors/worldstate/ProcessorRecordDynamic.hpp apps/openmw/mwmp/processors/worldstate/ProcessorRecordDynamic.hpp components/CMakeLists.txt components/openmw-mp/Packets/Player/PacketGUIBoxes.cpp		2018-05-25 06:34:07 +03:00
..
BaseActor.hpp	Merge pull request #421 from TES3MP/0.6.3 while resolving conflicts	2018-05-12 18:01:01 +03:00
BaseNetCreature.hpp	Merge pull request #415 from TES3MP/0.6.3 while resolving conflicts	2018-05-02 23:15:39 +03:00
BaseObject.hpp	Merge pull request #423 from TES3MP/0.6.3 while resolving conflicts	2018-05-13 03:20:01 +03:00
BasePacketProcessor.hpp	Fix build for gcc-5.4.0	2018-01-04 21:41:00 -05:00
BasePlayer.hpp	Merge pull request #434 from TES3MP/0.6.3 while resolving conflicts	2018-05-21 09:26:08 +03:00
BaseStructs.hpp	Merge pull request #434 from TES3MP/0.6.3 while resolving conflicts	2018-05-21 09:26:08 +03:00
BaseWorldstate.hpp	[General] Make it possible to set year via WorldTime	2018-05-25 03:33:12 +03:00