You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
openmw-tes3mp/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
7 years ago
..
Base Merge pull request #439 from TES3MP/0.6.3 while resolving conflicts 7 years ago
Controllers Merge pull request #439 from TES3MP/0.6.3 while resolving conflicts 7 years ago
Master [General] Simplify ProxyMasterPacket 7 years ago
Packets Merge pull request #439 from TES3MP/0.6.3 while resolving conflicts 7 years ago
Log.hpp Merge pull request #396 from TES3MP/0.6.3 while resolving conflicts 7 years ago
NetworkMessages.hpp Merge pull request #437 from TES3MP/0.6.3 while resolving conflicts 7 years ago
Utils.cpp [General] Add and use utility function for int value checks in vectors 7 years ago
Utils.hpp [General] Add and use utility function for int value checks in vectors 7 years ago
Version.hpp [General] Update version to 0.6.3 7 years ago