David Cernat
|
8b482e19ec
|
Merge pull request #453 from TES3MP/0.6.3 while resolving conflicts
Conflicts:
apps/openmw-mp/Script/Functions/Objects.cpp
apps/openmw-mp/Script/Functions/Objects.hpp
apps/openmw-mp/Script/Functions/Worldstate.cpp
apps/openmw-mp/Script/Functions/Worldstate.hpp
|
2018-06-27 14:53:46 +03:00 |
|
David Cernat
|
914b79fcc9
|
[General] Make it possible to check which placed objects have containers
|
2018-06-26 16:56:08 +03:00 |
|
David Cernat
|
8a393d2984
|
Merge pull request #430 from TES3MP/0.6.3 while resolving conflicts
# Conflicts:
# apps/openmw-mp/Networking.cpp
# apps/openmw-mp/Networking.hpp
# components/CMakeLists.txt
|
2018-05-18 08:12:28 +03:00 |
|
David Cernat
|
049d0d9ba7
|
[General] Fix remaining references to world packets/events
|
2018-05-17 00:08:37 +03:00 |
|
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 |
|
David Cernat
|
78234f9071
|
[General] Rename Event into ObjectList & WorldObject into BaseObject
|
2018-05-13 00:42:24 +03:00 |
|
David Cernat
|
672bb707a7
|
Merge pull request #422 from TES3MP/0.6.3 while resolving conflicts
# Conflicts:
# apps/openmw-mp/Networking.cpp
# apps/openmw-mp/Networking.hpp
# apps/openmw-mp/Script/Functions/World.cpp
# 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/mwmp/Networking.cpp
# components/CMakeLists.txt
# components/openmw-mp/Controllers/ObjectPacketController.hpp
# components/openmw-mp/Controllers/WorldPacketController.cpp
# components/openmw-mp/Packets/Object/ObjectPacket.cpp
# components/openmw-mp/Packets/Object/ObjectPacket.hpp
# components/openmw-mp/Packets/Object/PacketConsoleCommand.hpp
# components/openmw-mp/Packets/Object/PacketContainer.hpp
# 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/PacketObjectDelete.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-12 20:35:34 +03:00 |
|
David Cernat
|
6bf3a0be1e
|
[General] Rename WorldPackets into ObjectPackets for clarity
|
2018-05-12 19:40:00 +03:00 |
|