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/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
7 years ago
..
Actor Merge pull request #378 from TES3MP/0.6.3 while resolving conflicts 7 years ago
Player Merge pull request #396 from TES3MP/0.6.3 while resolving conflicts 7 years ago
World Merge pull request #396 from TES3MP/0.6.3 while resolving conflicts 7 years ago
BasePacket.cpp [General] Modernize packets 7 years ago
BasePacket.hpp [General] Modernize packets 7 years ago
PacketPreInit.cpp [General] Change regular enums to enum class 7 years ago
PacketPreInit.hpp [General] Modernize packets 7 years ago