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-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
7 years ago
..
Base Merge pull request #396 from TES3MP/0.6.3 while resolving conflicts 7 years ago
Controllers [General] Move similar functions to BasePacketController 7 years ago
Master [General] Simplify ProxyMasterPacket 7 years ago
Packets Merge pull request #396 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 #380 from TES3MP/0.6.3 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