1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-01 12:15:33 +00:00
openmw-tes3mp/apps/openmw-mp/processors
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
..
actor [Server] Use regular Ptrs where possible to avoid seizure Ptrs by lua 2018-02-16 05:12:01 +08:00
player Merge pull request #418 from TES3MP/0.6.3 while resolving conflicts 2018-05-10 22:33:36 +03:00
world Merge pull request #423 from TES3MP/0.6.3 while resolving conflicts 2018-05-13 03:20:01 +03:00
ActorProcessor.cpp [Server] Pass shared_ptr<Player> by reference 2017-12-08 07:32:49 +08:00
ActorProcessor.hpp [Server] Pass shared_ptr<Player> by reference 2017-12-08 07:32:49 +08:00
PlayerProcessor.cpp [Server] Add PreReading virtual method 2018-03-05 15:15:39 +08:00
PlayerProcessor.hpp [Server] Add PreReading virtual method 2018-03-05 15:15:39 +08:00
ProcessorInitializer.cpp Merge pull request #384 from TES3MP/0.6.3 while resolving conflicts 2018-02-12 06:50:52 +02:00
ProcessorInitializer.hpp [Server] Move Base processors and Initializer to processors subdirectory 2017-07-04 01:13:10 +08:00
WorldProcessor.cpp Merge pull request #423 from TES3MP/0.6.3 while resolving conflicts 2018-05-13 03:20:01 +03:00
WorldProcessor.hpp Merge pull request #423 from TES3MP/0.6.3 while resolving conflicts 2018-05-13 03:20:01 +03:00