openmw-tes3coop/components/openmw-mp
David Cernat 3d5860d6f4 Merge pull request #396 from TES3MP/0.6.3 while resolving conflicts
Conflicts:
	apps/openmw-mp/Player.cpp
	apps/openmw-mp/Script/Functions/Settings.cpp
	apps/openmw-mp/Script/Functions/Settings.hpp
	apps/openmw-mp/Script/Functions/World.cpp
	apps/openmw-mp/Script/Functions/World.hpp
	apps/openmw/mwgui/container.cpp
	apps/openmw/mwmp/LocalActor.cpp
	apps/openmw/mwmp/LocalPlayer.cpp
	apps/openmw/mwmp/WorldEvent.cpp
	apps/openmw/mwmp/processors/world/ProcessorContainer.hpp
	components/openmw-mp/Base/BaseEvent.hpp
	components/openmw-mp/Log.cpp
	components/openmw-mp/Log.hpp
2018-03-30 09:32:43 +03:00
..
Base Merge pull request #396 from TES3MP/0.6.3 while resolving conflicts 2018-03-30 09:32:43 +03:00
Controllers [General] Move similar functions to BasePacketController 2018-02-26 21:03:08 +08:00
Master [General] Simplify ProxyMasterPacket 2018-01-05 09:06:24 +08:00
Packets Merge pull request #396 from TES3MP/0.6.3 while resolving conflicts 2018-03-30 09:32:43 +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 #380 from TES3MP/0.6.3 2018-01-30 16:05:24 +02:00
Utils.cpp [General] Add and use utility function for int value checks in vectors 2017-11-26 13:03:54 +02:00
Utils.hpp [General] Add and use utility function for int value checks in vectors 2017-11-26 13:03:54 +02:00
Version.hpp [General] Update version to 0.6.3 2018-01-27 23:36:25 +02:00