openmw-tes3coop/components/openmw-mp
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
..
Base Merge pull request #439 from TES3MP/0.6.3 while resolving conflicts 2018-05-25 06:34:07 +03:00
Controllers Merge pull request #439 from TES3MP/0.6.3 while resolving conflicts 2018-05-25 06:34:07 +03:00
Master [General] Simplify ProxyMasterPacket 2018-01-05 09:06:24 +08:00
Packets Merge pull request #439 from TES3MP/0.6.3 while resolving conflicts 2018-05-25 06:34:07 +03:00
Log.hpp Merge pull request #396 from TES3MP/0.6.3 while resolving conflicts 2018-03-30 09:32:43 +03:00
NetworkMessages.hpp Merge pull request #437 from TES3MP/0.6.3 while resolving conflicts 2018-05-23 06:41:23 +03:00
Utils.cpp [General] Add and use utility function for int value checks in vectors 2018-04-19 18:16:10 +03:00
Utils.hpp [General] Add and use utility function for int value checks in vectors 2018-04-19 18:16:10 +03:00
Version.hpp [General] Update version to 0.6.3 2018-01-27 23:36:25 +02:00