1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-31 21:45:33 +00:00
openmw-tes3mp/apps/openmw-mp
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
..
processors Merge pull request #422 from TES3MP/0.6.3 while resolving conflicts 2018-05-12 20:35:34 +03:00
Script [General] Rename WorldPackets into ObjectPackets for clarity 2018-05-12 19:40:00 +03:00
stackwalker [Server] Add StackWalker for Windows 2017-10-27 05:27:07 +08:00
Actors.cpp Merge pull request #421 from TES3MP/0.6.3 while resolving conflicts 2018-05-12 18:01:01 +03:00
Actors.hpp Merge pull request #421 from TES3MP/0.6.3 while resolving conflicts 2018-05-12 18:01:01 +03:00
BaseMgr.cpp [Server] Iterate only through updated players on each frame 2018-01-02 11:57:32 +08:00
BaseMgr.hpp [Server] Iterate only through updated players on each frame 2018-01-02 11:57:32 +08:00
Books.cpp [Server] Iterate only through updated players on each frame 2018-01-02 11:57:32 +08:00
Books.hpp [Server] Iterate only through updated players on each frame 2018-01-02 11:57:32 +08:00
Cell.cpp Merge pull request #422 from TES3MP/0.6.3 while resolving conflicts 2018-05-12 20:35:34 +03:00
Cell.hpp Merge pull request #422 from TES3MP/0.6.3 while resolving conflicts 2018-05-12 20:35:34 +03:00
CellController.cpp [General] Change regular enums to enum class 2018-01-02 12:44:53 +08:00
CellController.hpp Merge pull request #422 from TES3MP/0.6.3 while resolving conflicts 2018-05-12 20:35:34 +03:00
Cells.cpp [Server] Iterate only through updated players on each frame 2018-01-02 11:57:32 +08:00
Cells.hpp [Server] Iterate only through updated players on each frame 2018-01-02 11:57:32 +08:00
CellState.cpp [General] Change regular enums to enum class 2018-01-02 12:44:53 +08:00
CellState.hpp [General] Change regular enums to enum class 2018-01-02 12:44:53 +08:00
CharClass.cpp [Server] Iterate only through updated players on each frame 2018-01-02 11:57:32 +08:00
CharClass.hpp [Server] Iterate only through updated players on each frame 2018-01-02 11:57:32 +08:00
CMakeLists.txt [Server] Create ShapeshiftFunctions and move relevant functions there 2018-04-18 10:45:39 +03:00
Dialogue.cpp [Server] Iterate only through updated players on each frame 2018-01-02 11:57:32 +08:00
Dialogue.hpp [Server] Iterate only through updated players on each frame 2018-01-02 11:57:32 +08:00
Factions.cpp [General] Rework PacketPlayerFaction 2018-01-20 19:45:24 +08:00
Factions.hpp [General] Rework PacketPlayerFaction 2018-01-20 19:45:24 +08:00
GUI.cpp Merge pull request #418 from TES3MP/0.6.3 while resolving conflicts 2018-05-10 22:33:36 +03:00
GUI.hpp Merge pull request #418 from TES3MP/0.6.3 while resolving conflicts 2018-05-10 22:33:36 +03:00
Inventory.cpp [General] Rework PacketPlayerInventory 2018-01-20 18:40:23 +08:00
Inventory.hpp [General] Rework PacketPlayerInventory 2018-01-20 18:40:23 +08:00
main.cpp [Server] Fix warning "implicit fallthrough" 2017-12-06 13:30:39 +08:00
MasterClient.cpp [Server] Clean up method and variable names 2017-12-04 10:39:20 +02:00
MasterClient.hpp [Server] Clean up method and variable names 2017-12-04 10:39:20 +02:00
NetActor.cpp Merge pull request #415 from TES3MP/0.6.3 while resolving conflicts 2018-05-02 23:15:39 +03:00
NetActor.hpp Merge pull request #421 from TES3MP/0.6.3 while resolving conflicts 2018-05-12 18:01:01 +03:00
Networking.cpp Merge pull request #422 from TES3MP/0.6.3 while resolving conflicts 2018-05-12 20:35:34 +03:00
Networking.hpp Merge pull request #422 from TES3MP/0.6.3 while resolving conflicts 2018-05-12 20:35:34 +03:00
Object.cpp Merge pull request #422 from TES3MP/0.6.3 while resolving conflicts 2018-05-12 20:35:34 +03:00
Object.hpp Merge pull request #415 from TES3MP/0.6.3 while resolving conflicts 2018-05-02 23:15:39 +03:00
Player.cpp Merge pull request #418 from TES3MP/0.6.3 while resolving conflicts 2018-05-10 22:33:36 +03:00
Player.hpp Merge pull request #418 from TES3MP/0.6.3 while resolving conflicts 2018-05-10 22:33:36 +03:00
Players.cpp [Server] Use regular Ptrs where possible to avoid seizure Ptrs by lua 2018-02-16 05:12:01 +08:00
Players.hpp [Server] Use regular Ptrs where possible to avoid seizure Ptrs by lua 2018-02-16 05:12:01 +08:00
Quests.cpp [General] Change regular enums to enum class 2018-01-02 12:44:53 +08:00
Quests.hpp [General] Change regular enums to enum class 2018-01-02 12:44:53 +08:00
Settings.cpp Merge pull request #396 from TES3MP/0.6.3 while resolving conflicts 2018-03-30 09:32:43 +03:00
Settings.hpp Merge pull request #396 from TES3MP/0.6.3 while resolving conflicts 2018-03-30 09:32:43 +03:00
Spells.cpp [Server] Iterate only through updated players on each frame 2018-01-02 11:57:32 +08:00
Spells.hpp [Server] Iterate only through updated players on each frame 2018-01-02 11:57:32 +08:00
stacktrace.cpp [Server] Add StackWalker for Windows 2017-10-27 05:27:07 +08:00
stacktrace.hpp [Server] Add stacktrace 2017-10-25 14:45:36 +08:00
Timer.cpp [Server] Fix uninitialized variable 2018-02-16 04:36:44 +08:00
Timer.hpp [Server] Fix iterating killed timers when kill() called in the callback 2018-01-08 12:24:36 +08:00
Utils.cpp [Server] Add PreReading virtual method 2018-03-05 15:15:39 +08:00
Utils.hpp [Server] Make argument const reference 2017-12-10 11:46:50 +08:00
Weather.cpp [Server] Iterate only through updated players on each frame 2018-01-02 11:57:32 +08:00
Weather.hpp [Server] Iterate only through updated players on each frame 2018-01-02 11:57:32 +08:00
Window.cpp [Server] Iterate only through updated players on each frame 2018-01-02 11:57:32 +08:00
Window.hpp [Server] Iterate only through updated players on each frame 2018-01-02 11:57:32 +08:00