3f7e163c92
Merge pull request #439 from TES3MP/0.6.3 while resolving conflicts
...
Conflicts:
apps/openmw-mp/CMakeLists.txt
apps/openmw-mp/Script/Functions/GUI.cpp
apps/openmw-mp/Script/Functions/GUI.hpp
apps/openmw-mp/Script/Functions/Worldstate.cpp
apps/openmw-mp/Script/Functions/Worldstate.hpp
apps/openmw-mp/processors/worldstate/ProcessorRecordDynamic.hpp
apps/openmw/mwmp/processors/worldstate/ProcessorRecordDynamic.hpp
components/CMakeLists.txt
components/openmw-mp/Packets/Player/PacketGUIBoxes.cpp
7 years ago
49ea76aa9d
[General] Add notes for InputDialogs in GUIBoxes packet
7 years ago
3b5fb9cd6b
[General] Make it possible to set year via WorldTime
7 years ago
4acf93b7db
[General] Make it possible to set days passed via WorldTime
7 years ago
74c2a0b311
Merge pull request #438 from OpenMW/master
...
Add OpenMW commits up to 24 May 2018
7 years ago
46744ee90f
[General] Make WorldTime script functions more consistent with others
7 years ago
810e4416f6
Merged pull request #1691
7 years ago
d92d754834
Merged pull request #1697
7 years ago
8d36d0d945
[General] Make it possible to change world's time scale via WorldTime
7 years ago
f01c761cb1
[General] Use correct orderChannel for WorldTime packets
7 years ago
0be6de6607
[General] Turn RecordDynamic into a Worldstate packet
7 years ago
7083cb0359
Merge pull request #437 from TES3MP/0.6.3 while resolving conflicts
7 years ago
da66face25
[General] Rename GameTime packet into WorldTime
7 years ago
296c69d788
Merge pull request #436 from OpenMW/master
...
Add OpenMW commits up to 22 May 2018
7 years ago
888c2d9a33
Render default land texture for Wilderness cells with distant terrain
7 years ago
ad4214d3e2
Merge pull request #434 from TES3MP/0.6.3 while resolving conflicts
...
Conflicts:
apps/openmw-mp/Networking.cpp
apps/openmw/mwmp/processors/worldstate/ProcessorGameTime.hpp
components/CMakeLists.txt
components/openmw-mp/Base/BasePlayer.hpp
components/openmw-mp/Packets/Worldstate/PacketGameTime.hpp
7 years ago
5af1150ab2
[General] Turn GameTime into a Worldstate packet
7 years ago
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
7 years ago
43a944ddaf
[General] Add and implement new Worldstate packet type
7 years ago
049d0d9ba7
[General] Fix remaining references to world packets/events
7 years ago
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
78234f9071
[General] Rename Event into ObjectList & WorldObject into BaseObject
7 years ago
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
6bf3a0be1e
[General] Rename WorldPackets into ObjectPackets for clarity
7 years ago
7c8dd7380f
Merge pull request #421 from TES3MP/0.6.3 while resolving conflicts
...
Conflicts:
apps/openmw-mp/Script/Functions/Actors.cpp
apps/openmw-mp/Script/Functions/Actors.hpp
apps/openmw-mp/Script/Functions/Cells.cpp
7 years ago
5458e09c8a
Merge pull request #420 from OpenMW/master
...
Add OpenMW commits up to 11 May 2018
7 years ago
77389538e8
[General] Implement ActorAI packet, part 1
...
The server can now make actors become followers of players or other actors.
7 years ago
b7cce1a665
Merged pull request #1702
7 years ago
c5f33e451f
Merge pull request #418 from TES3MP/0.6.3 while resolving conflicts
7 years ago
d4f278a113
Replacing tab with spaces
7 years ago
feeee50a88
Dropping a separate NPDTstruct12 object and instead use NPDTstruct52
...
NPDTstruct12 is now only used when loading and saving. Turning auto calc
on and off now no longer switches between to different set of values
7 years ago
3197ebd8e7
Merged pull request #1694
7 years ago
715012f087
[General] Implement sending of image data for map tiles in PlayerMap
7 years ago
1dd36329a3
Load default markers definitions (bug #4410 )
7 years ago
f5b7a230fc
ESMReader::close now clears mHeader
7 years ago
69c659852d
Merge pull request #1689 )
7 years ago
4846497078
Merge pull request #415 from TES3MP/0.6.3 while resolving conflicts
...
Conflicts:
apps/openmw-mp/Script/Functions/Positions.cpp
apps/openmw-mp/Script/Functions/Positions.hpp
apps/openmw-mp/Script/Functions/World.cpp
apps/openmw-mp/Script/Functions/World.hpp
apps/openmw-mp/Script/Script.hpp
apps/openmw-mp/Script/ScriptFunctions.cpp
components/openmw-mp/Base/BasePlayer.hpp
7 years ago
6cc7405194
Remove unnecessary command from QuadTreeWorld destructor (bug #4408 )
7 years ago
099f85be0a
[General] Implement PlayerMomentum packet & associated script functions
7 years ago
273179fd5a
Merge pull request #414 from OpenMW/master
...
Add OpenMW commits up to 29 Apr 2018
7 years ago
4b501a39f4
[General] Implement DoorDestination packet & associated script functions
7 years ago
f4cd7ff5b2
Merge pull request #1690
7 years ago
d967983f5c
Assume Morrowind.esm dependency for dependency-less content addons ( fixes #2829 )
7 years ago
5afcc56860
Handle NiLookAtController (feature #4407 )
7 years ago
502751cae0
Merge pull request #413 from TES3MP/0.6.3 while resolving conflicts
...
Conflicts:
apps/openmw-mp/processors/player/ProcessorPlayerCellChange.hpp
components/openmw-mp/Base/BasePlayer.hpp
components/openmw-mp/Packets/Player/PacketPlayerEquipment.hpp
components/openmw-mp/Packets/Player/PacketPlayerSkill.cpp
7 years ago
66d5109509
[General] Fix information exchange for players sharing a cell
...
Previously, two players entering the same cell only sent and received their latest changes for dynamic stats, attributes, skills and equipment when they started sharing that cell.
7 years ago
7db74509e0
Merge pull request #412 from OpenMW/master while resolving conflicts
...
# Conflicts:
# apps/openmw/mwscript/transformationextensions.cpp
7 years ago
55a6344fb0
Revert log spam
7 years ago
02eef933fd
Merge pull request #411 from OpenMW/master
...
Add OpenMW commits up to 19 Apr 2018
7 years ago
d58efde3f1
Merge pull request #410 from TES3MP/0.6.3 while resolving conflicts
...
Conflicts:
apps/openmw-mp/Script/Functions/Actors.cpp
apps/openmw-mp/Script/Functions/Chat.cpp
apps/openmw-mp/Script/Functions/GUI.hpp
apps/openmw-mp/Script/Functions/Items.cpp
apps/openmw-mp/Script/Functions/Stats.cpp
apps/openmw-mp/Script/Functions/Stats.hpp
apps/openmw-mp/Script/ScriptFunctions.cpp
apps/openmw-mp/Script/ScriptFunctions.hpp
apps/openmw-mp/processors/player/ProcessorPlayerCharGen.hpp
apps/openmw/mwmp/Cell.cpp
apps/openmw/mwmp/DedicatedActor.cpp
apps/openmw/mwmp/DedicatedPlayer.cpp
apps/openmw/mwmp/LocalActor.cpp
apps/openmw/mwmp/LocalPlayer.cpp
apps/openmw/mwmp/LocalPlayer.hpp
apps/openmw/mwmp/Main.cpp
components/openmw-mp/Base/BaseActor.hpp
components/openmw-mp/Base/BasePlayer.hpp
components/openmw-mp/Packets/Player/PacketPlayerAttribute.cpp
components/openmw-mp/Packets/Player/PacketPlayerSkill.cpp
7 years ago
David Cernat
Marc Zinnschlag
Andrei Kortunov
Alf Henrik Sauge
tri4ng1e
scrawl
Capostrophic