krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity
openmw-tes3coop/components/openmw-mp/Packets/Object
History
David Cernat d4dbfdfdb6 Merge pull request #423 from TES3MP/0.6.3 while resolving conflicts 
Conflicts:
	apps/openmw-mp/Networking.cpp
	apps/openmw-mp/Script/Functions/World.cpp
	apps/openmw-mp/Script/Functions/World.hpp
	apps/openmw-mp/processors/WorldProcessor.cpp
	apps/openmw-mp/processors/WorldProcessor.hpp
	apps/openmw-mp/processors/world/ProcessorContainer.hpp
	apps/openmw-mp/processors/world/ProcessorDoorState.hpp
	apps/openmw-mp/processors/world/ProcessorObjectDelete.hpp
	apps/openmw-mp/processors/world/ProcessorObjectLock.hpp
	apps/openmw-mp/processors/world/ProcessorObjectPlace.hpp
	apps/openmw-mp/processors/world/ProcessorObjectScale.hpp
	apps/openmw-mp/processors/world/ProcessorObjectSpawn.hpp
	apps/openmw-mp/processors/world/ProcessorObjectState.hpp
	apps/openmw-mp/processors/world/ProcessorObjectTrap.hpp
	apps/openmw/mwgui/container.cpp
	apps/openmw/mwmp/Networking.cpp
	apps/openmw/mwmp/ObjectList.cpp
	apps/openmw/mwmp/ObjectList.hpp
	apps/openmw/mwmp/processors/world/ProcessorContainer.hpp
	components/CMakeLists.txt
	components/openmw-mp/Base/BaseObject.hpp
	components/openmw-mp/Packets/Object/ObjectPacket.cpp
	components/openmw-mp/Packets/Object/PacketConsoleCommand.cpp
	components/openmw-mp/Packets/Object/PacketContainer.cpp
	components/openmw-mp/Packets/Object/PacketDoorState.hpp
	components/openmw-mp/Packets/Object/PacketMusicPlay.hpp
	components/openmw-mp/Packets/Object/PacketObjectAnimPlay.hpp
	components/openmw-mp/Packets/Object/PacketObjectLock.hpp
	components/openmw-mp/Packets/Object/PacketObjectMove.hpp
	components/openmw-mp/Packets/Object/PacketObjectPlace.hpp
	components/openmw-mp/Packets/Object/PacketObjectRotate.hpp
	components/openmw-mp/Packets/Object/PacketObjectScale.hpp
	components/openmw-mp/Packets/Object/PacketObjectSpawn.hpp
	components/openmw-mp/Packets/Object/PacketObjectState.hpp
	components/openmw-mp/Packets/Object/PacketObjectTrap.hpp
	components/openmw-mp/Packets/Object/PacketScriptGlobalShort.hpp
	components/openmw-mp/Packets/Object/PacketScriptLocalFloat.hpp
	components/openmw-mp/Packets/Object/PacketScriptLocalShort.hpp
	components/openmw-mp/Packets/Object/PacketScriptMemberShort.hpp
	components/openmw-mp/Packets/Object/PacketVideoPlay.hpp
2018-05-13 03:20:01 +03:00
..
ObjectPacket.cpp Merge pull request #423 from TES3MP/0.6.3 while resolving conflicts 2018-05-13 03:20:01 +03:00
ObjectPacket.hpp Merge pull request #423 from TES3MP/0.6.3 while resolving conflicts 2018-05-13 03:20:01 +03:00
PacketConsoleCommand.cpp Merge pull request #423 from TES3MP/0.6.3 while resolving conflicts 2018-05-13 03:20:01 +03:00
PacketConsoleCommand.hpp Merge pull request #422 from TES3MP/0.6.3 while resolving conflicts 2018-05-12 20:35:34 +03:00
PacketContainer.cpp Merge pull request #423 from TES3MP/0.6.3 while resolving conflicts 2018-05-13 03:20:01 +03:00
PacketContainer.hpp Merge pull request #422 from TES3MP/0.6.3 while resolving conflicts 2018-05-12 20:35:34 +03:00
PacketDoorDestination.cpp [General] Rename Event into ObjectList & WorldObject into BaseObject 2018-05-13 00:42:24 +03:00
PacketDoorDestination.hpp [General] Rename Event into ObjectList & WorldObject into BaseObject 2018-05-13 00:42:24 +03:00
PacketDoorState.cpp [General] Rename Event into ObjectList & WorldObject into BaseObject 2018-05-13 00:42:24 +03:00
PacketDoorState.hpp Merge pull request #423 from TES3MP/0.6.3 while resolving conflicts 2018-05-13 03:20:01 +03:00
PacketMusicPlay.cpp [General] Rename Event into ObjectList & WorldObject into BaseObject 2018-05-13 00:42:24 +03:00
PacketMusicPlay.hpp Merge pull request #423 from TES3MP/0.6.3 while resolving conflicts 2018-05-13 03:20:01 +03:00
PacketObjectAnimPlay.cpp [General] Rename Event into ObjectList & WorldObject into BaseObject 2018-05-13 00:42:24 +03:00
PacketObjectAnimPlay.hpp Merge pull request #423 from TES3MP/0.6.3 while resolving conflicts 2018-05-13 03:20:01 +03:00
PacketObjectAttach.cpp [General] Rename Event into ObjectList & WorldObject into BaseObject 2018-05-13 00:42:24 +03:00
PacketObjectAttach.hpp [General] Rename Event into ObjectList & WorldObject into BaseObject 2018-05-13 00:42:24 +03:00
PacketObjectCollision.cpp [General] Rename Event into ObjectList & WorldObject into BaseObject 2018-05-13 00:42:24 +03:00
PacketObjectCollision.hpp [General] Rename Event into ObjectList & WorldObject into BaseObject 2018-05-13 00:42:24 +03:00
PacketObjectDelete.cpp [General] Rename WorldPackets into ObjectPackets for clarity 2018-05-12 19:40:00 +03:00
PacketObjectDelete.hpp Merge pull request #422 from TES3MP/0.6.3 while resolving conflicts 2018-05-12 20:35:34 +03:00
PacketObjectLock.cpp [General] Rename Event into ObjectList & WorldObject into BaseObject 2018-05-13 00:42:24 +03:00
PacketObjectLock.hpp Merge pull request #423 from TES3MP/0.6.3 while resolving conflicts 2018-05-13 03:20:01 +03:00
PacketObjectMove.cpp [General] Rename Event into ObjectList & WorldObject into BaseObject 2018-05-13 00:42:24 +03:00
PacketObjectMove.hpp Merge pull request #423 from TES3MP/0.6.3 while resolving conflicts 2018-05-13 03:20:01 +03:00
PacketObjectPlace.cpp [General] Rename Event into ObjectList & WorldObject into BaseObject 2018-05-13 00:42:24 +03:00
PacketObjectPlace.hpp Merge pull request #423 from TES3MP/0.6.3 while resolving conflicts 2018-05-13 03:20:01 +03:00
PacketObjectReset.cpp [General] Rename Event into ObjectList & WorldObject into BaseObject 2018-05-13 00:42:24 +03:00
PacketObjectReset.hpp [General] Rename Event into ObjectList & WorldObject into BaseObject 2018-05-13 00:42:24 +03:00
PacketObjectRotate.cpp [General] Rename Event into ObjectList & WorldObject into BaseObject 2018-05-13 00:42:24 +03:00
PacketObjectRotate.hpp Merge pull request #423 from TES3MP/0.6.3 while resolving conflicts 2018-05-13 03:20:01 +03:00
PacketObjectScale.cpp [General] Rename Event into ObjectList & WorldObject into BaseObject 2018-05-13 00:42:24 +03:00
PacketObjectScale.hpp Merge pull request #423 from TES3MP/0.6.3 while resolving conflicts 2018-05-13 03:20:01 +03:00
PacketObjectSpawn.cpp [General] Rename Event into ObjectList & WorldObject into BaseObject 2018-05-13 00:42:24 +03:00
PacketObjectSpawn.hpp Merge pull request #423 from TES3MP/0.6.3 while resolving conflicts 2018-05-13 03:20:01 +03:00
PacketObjectState.cpp [General] Rename Event into ObjectList & WorldObject into BaseObject 2018-05-13 00:42:24 +03:00
PacketObjectState.hpp Merge pull request #423 from TES3MP/0.6.3 while resolving conflicts 2018-05-13 03:20:01 +03:00
PacketObjectTrap.cpp [General] Rename Event into ObjectList & WorldObject into BaseObject 2018-05-13 00:42:24 +03:00
PacketObjectTrap.hpp Merge pull request #423 from TES3MP/0.6.3 while resolving conflicts 2018-05-13 03:20:01 +03:00
PacketScriptGlobalFloat.cpp [General] Rename Event into ObjectList & WorldObject into BaseObject 2018-05-13 00:42:24 +03:00
PacketScriptGlobalFloat.hpp [General] Rename Event into ObjectList & WorldObject into BaseObject 2018-05-13 00:42:24 +03:00
PacketScriptGlobalShort.cpp [General] Rename Event into ObjectList & WorldObject into BaseObject 2018-05-13 00:42:24 +03:00
PacketScriptGlobalShort.hpp Merge pull request #423 from TES3MP/0.6.3 while resolving conflicts 2018-05-13 03:20:01 +03:00
PacketScriptLocalFloat.cpp [General] Rename Event into ObjectList & WorldObject into BaseObject 2018-05-13 00:42:24 +03:00
PacketScriptLocalFloat.hpp Merge pull request #423 from TES3MP/0.6.3 while resolving conflicts 2018-05-13 03:20:01 +03:00
PacketScriptLocalShort.cpp [General] Rename Event into ObjectList & WorldObject into BaseObject 2018-05-13 00:42:24 +03:00
PacketScriptLocalShort.hpp Merge pull request #423 from TES3MP/0.6.3 while resolving conflicts 2018-05-13 03:20:01 +03:00
PacketScriptMemberFloat.cpp [General] Rename Event into ObjectList & WorldObject into BaseObject 2018-05-13 00:42:24 +03:00
PacketScriptMemberFloat.hpp [General] Rename Event into ObjectList & WorldObject into BaseObject 2018-05-13 00:42:24 +03:00
PacketScriptMemberShort.cpp [General] Rename Event into ObjectList & WorldObject into BaseObject 2018-05-13 00:42:24 +03:00
PacketScriptMemberShort.hpp Merge pull request #423 from TES3MP/0.6.3 while resolving conflicts 2018-05-13 03:20:01 +03:00
PacketVideoPlay.cpp [General] Rename Event into ObjectList & WorldObject into BaseObject 2018-05-13 00:42:24 +03:00
PacketVideoPlay.hpp Merge pull request #423 from TES3MP/0.6.3 while resolving conflicts 2018-05-13 03:20:01 +03:00