524363702c
Merge pull request #451 from TES3MP/0.6.3 while resolving conflicts
...
# Conflicts:
# apps/openmw-mp/Networking.cpp
# apps/openmw-mp/main.cpp
# apps/openmw-mp/processors/object/ProcessorObjectDelete.hpp
7 years ago
176aa62b15
Merge pull request #446 from TES3MP/0.6.3 while resolving conflicts
...
Conflicts:
apps/openmw-mp/Script/Functions/Cells.cpp
apps/openmw-mp/Script/Functions/Cells.hpp
apps/openmw-mp/Script/Functions/Worldstate.cpp
apps/openmw-mp/Script/Functions/Worldstate.hpp
apps/openmw-mp/Script/ScriptFunctions.hpp
apps/openmw-mp/processors/player/ProcessorPlayerMap.hpp
apps/openmw/mwmp/processors/player/ProcessorPlayerMap.hpp
components/openmw-mp/Base/BasePlayer.hpp
components/openmw-mp/Packets/Player/PacketPlayerMap.hpp
components/openmw-mp/Packets/Worldstate/PacketWorldMap.cpp
7 years ago
72862dc255
[General] Turn PlayerMap into WorldMap, now a Worldstate packet
7 years ago
6bb2a7e24a
Merge pull request #444 from TES3MP/0.6.3 while resolving conflicts
7 years ago
a28b27f5d9
Merge pull request #443 from OpenMW/master while resolving conflicts
...
# Conflicts:
# README.md
7 years ago
494edbe5cb
[General] Add REPLY_TO_REQUEST container sub-action
7 years ago
c24157f6f9
[General] Fix CMakeLists in components for BaseObject
7 years ago
c20a0c72c5
Merge pull request #442 from OpenMW/master while resolving conflicts
...
# Conflicts:
# CMakeLists.txt
7 years ago
13f7b53b1c
Revert "Don't force DDS file usage ( fixes #1392 )"
...
This reverts commit 90f3ff2da4
7 years ago
4a2b973052
Merge pull request #1726 from elsid/fix_catch_warnings
...
Fix warnings: catching polymorphic type by value
7 years ago
eecde340cf
Make weapon health short unsigned ( fixes #4435 )
7 years ago
dba79f4d4d
Fix warnings: catching polymorphic type by value
...
openmw/apps/openmw/mwworld/worldimp.cpp: In member function ‘virtual bool MWWorld::World::findExteriorPosition(const string&, ESM::Position&)’:
openmw/apps/openmw/mwworld/worldimp.cpp:2650:25: warning: catching polymorphic type ‘class std::invalid_argument’ by value [-Wcatch-value=]
catch (std::invalid_argument)
^~~~~~~~~~~~~~~~
openmw/apps/openmw/mwworld/worldimp.cpp:2654:25: warning: catching polymorphic type ‘class std::out_of_range’ by value [-Wcatch-value=]
catch (std::out_of_range)
^~~~~~~~~~~~
openmw/components/widgets/numericeditbox.cpp: In member function ‘void Gui::NumericEditBox::onEditTextChange(MyGUI::EditBox*)’:
openmw/components/widgets/numericeditbox.cpp:41:21: warning: catching polymorphic type ‘class std::invalid_argument’ by value [-Wcatch-value=]
catch (std::invalid_argument)
^~~~~~~~~~~~~~~~
openmw/components/widgets/numericeditbox.cpp:45:21: warning: catching polymorphic type ‘class std::out_of_range’ by value [-Wcatch-value=]
catch (std::out_of_range)
^~~~~~~~~~~~
7 years ago
fc4d3fe3fa
Merge pull request #441 from TES3MP/0.6.3 while resolving conflicts
...
Conflicts:
apps/openmw-mp/Script/Functions/Worldstate.cpp
apps/openmw-mp/Script/Functions/Worldstate.hpp
7 years ago
669d4d3d7e
Merge pull request #440 from OpenMW/master
...
Add OpenMW commits up to 27 May 2018
7 years ago
3efe05a88e
[General] Implement WorldCollisionOverride packet
7 years ago
416ee77639
[General] Add placeholder for WorldCollisionOverride packet
7 years ago
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
afae398b5c
Use utf8 lowercase function for journal index to avoid code duplication
7 years ago
b5374029e5
Implement case-insensitive search in spell window
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
David Cernat
Marc Zinnschlag
Bret Curtis
Capostrophic
elsid
Andrei Kortunov
Alf Henrik Sauge