openmw-tes3coop/components/openmw-mp/Packets
David Cernat a037193e79 Merge pull request #372 from TES3MP/0.6.2 while resolving conflicts
Conflicts:
	apps/openmw-mp/Script/Functions/Actors.cpp
	apps/openmw-mp/Script/Functions/Actors.hpp
	apps/openmw-mp/Script/Functions/Items.cpp
	apps/openmw-mp/Script/Functions/Items.hpp
	apps/openmw-mp/Script/Functions/World.cpp
	apps/openmw-mp/Script/Functions/World.hpp
	apps/openmw/mwmp/WorldEvent.cpp
	components/openmw-mp/Packets/Player/PacketPlayerEquipment.cpp
	components/openmw-mp/Version.hpp
2018-01-18 13:40:13 +02:00
..
Actor Merge pull request #363 from TES3MP/0.6.2 while resolving conflicts, 2nd try 2018-01-01 12:04:25 +02:00
Player Merge pull request #372 from TES3MP/0.6.2 while resolving conflicts 2018-01-18 13:40:13 +02:00
World Merge pull request #363 from TES3MP/0.6.2 while resolving conflicts, 2nd try 2018-01-01 12:04:25 +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