openmw-tes3coop/components/openmw-mp/Packets
David Cernat ac374a8ef9 Merge pull request #384 from TES3MP/0.6.3 while resolving conflicts
Conflicts:
 	apps/openmw-mp/Player.cpp
	apps/openmw-mp/Script/Functions/Mechanics.cpp
	apps/openmw-mp/Script/Functions/Mechanics.hpp
	apps/openmw-mp/Script/Functions/Quests.cpp
	apps/openmw-mp/Script/Functions/Quests.hpp
	apps/openmw-mp/Script/ScriptFunctions.hpp
	apps/openmw-mp/processors/player/ProcessorRecordDynamic.hpp
	apps/openmw/mwmp/LocalPlayer.hpp
	apps/openmw/mwmp/WorldEvent.cpp
	apps/openmw/mwworld/worldimp.cpp
	components/openmw-mp/Base/BasePlayer.hpp
2018-02-12 06:50:52 +02:00
..
Actor Merge pull request #378 from TES3MP/0.6.3 while resolving conflicts 2018-01-30 00:54:56 +02:00
Player Merge pull request #384 from TES3MP/0.6.3 while resolving conflicts 2018-02-12 06:50:52 +02:00
World Merge pull request #380 from TES3MP/0.6.3 2018-01-30 16:05:24 +02:00
BasePacket.cpp [General] Modernize packets 2017-12-09 10:13:27 +08:00
BasePacket.hpp [General] Modernize packets 2017-12-09 10:13:27 +08:00
PacketPreInit.cpp [General] Change regular enums to enum class 2018-01-02 12:44:53 +08:00
PacketPreInit.hpp [General] Modernize packets 2017-12-09 10:13:27 +08:00