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
|
7 years ago |
David Cernat
|
78234f9071
|
[General] Rename Event into ObjectList & WorldObject into BaseObject
|
7 years ago |
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
|
7 years ago |
David Cernat
|
6bf3a0be1e
|
[General] Rename WorldPackets into ObjectPackets for clarity
|
7 years ago |
Koncord
|
122a30c183
|
[General] Change type of refNumIndex & mpNum to unsigned
|
7 years ago |
Koncord
|
585c24cee8
|
[Server] Optimize CellController
|
7 years ago |
David Cernat
|
06f3c07116
|
[Server] Only read Actor packets from players who are still authorities
|
8 years ago |
David Cernat
|
83ba4b62b1
|
[Server] Remove Actors from a Cell's ActorList when they change cells
|
8 years ago |
David Cernat
|
a73cbac226
|
[Server] Store a BaseActorList in every Cell to keep track of Actor data
|
8 years ago |
David Cernat
|
234510a87f
|
[Server] Split off Cell and CellController into two different files
|
8 years ago |
David Cernat
|
c52084a028
|
[General] Use BaseActorLists in ActorPackets
|
8 years ago |
David Cernat
|
070c6a3bd4
|
[General] Add ActorPacketController & make controller var names clearer
|
8 years ago |
Koncord
|
b33e604a61
|
[Server] Set sendToLoaded function as constant
Add assertions for CellController singleton
|
8 years ago |
Koncord
|
443c0ed309
|
[Server] Fix Cell iterators
|
8 years ago |
David Cernat
|
791089d342
|
[Server] Add Cell::sendToLoaded() for sending events to loaded players
|
8 years ago |
David Cernat
|
eb0744aa77
|
[Server] Add CellController:getCell() for getting Cell through ESM::Cell
|
8 years ago |
David Cernat
|
ee1ba1728e
|
[Server] Rename getCellByID() into getCellByName() to avoid confusion
|
8 years ago |
David Cernat
|
275dfaf05f
|
[Server] Add Cell::getDescription() for debugging purposes
|
8 years ago |
Koncord
|
67099e437a
|
[Server] Remove player from Cells when disconnected
|
8 years ago |
Koncord
|
846ceacc90
|
[Server] Add begin & end iterators to Cell class
|
8 years ago |
Koncord
|
bbc062de62
|
[Server] Use lowCamelCase in Cell
|
8 years ago |
Koncord
|
8887a267c7
|
[Server] Add Cell and CellController
|
8 years ago |