1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-22 00:23:51 +00:00
openmw-tes3mp/components/openmw-mp/Packets
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
..
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 #396 from TES3MP/0.6.3 while resolving conflicts 2018-03-30 09:32:43 +03:00
World Merge pull request #396 from TES3MP/0.6.3 while resolving conflicts 2018-03-30 09:32:43 +03: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