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
7 years ago
David Cernat
7060ff59c5
[Client] Enforce the default global map cell size in multiplayer
7 years ago
David Cernat
fec500c4b0
[Client] Reduce container debug spam by requiring VERBOSE logging for it
7 years ago
David Cernat
914b79fcc9
[General] Make it possible to check which placed objects have containers
7 years ago
David Cernat
d5b3d08ec9
Merge pull request #452 from TES3MP/0.6.3 while resolving conflicts
...
Conflicts:
apps/openmw-mp/Script/Functions/Worldstate.cpp
apps/openmw/mwmp/Worldstate.cpp
components/openmw-mp/Base/BaseWorldstate.hpp
7 years ago
David Cernat
deda6ec071
[Client] Don't send WorldMap packets for already explored map tiles
7 years ago
David Cernat
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
David Cernat
7e90d1f2a4
[Client] Fix interior-to-exterior and v.v. cell transitions for actors
...
Make sure only players who are cell authorities can get actors to teleport across cells for them, and display a message box for players who are not cell authorities.
7 years ago
David Cernat
fd05beef94
[Client] Don't delete disposed of corpses on client
...
Clients should instead await a server reply approving the deletion.
7 years ago
David Cernat
aa3639f2da
Merge pull request #450 from TES3MP/0.6.2
...
Add 0.6.2 commits up to 19 Jun 2018
7 years ago
David Cernat
5b461b09ca
[Client] Display error when receiving ID_INCOMPATIBLE_PROTOCOL_VERSION
7 years ago
David Cernat
29be79e852
[General] Switch RakNet enums to CrabNet enums
...
CrabNet is TES3MP's fork of RakNet that has deviated too far from RakNet to still be compatible with it.
7 years ago
David Cernat
b3c398605f
Merge pull request #448 from TES3MP/0.6.3
...
Add 0.6.3 commits up to 8 Jun 2018
7 years ago
David Cernat
2a3c74bfcc
Merge pull request #447 from OpenMW/master while resolving conflicts
...
# Conflicts:
# README.md
7 years ago
David Cernat
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
Marc Zinnschlag
7b4a69ff2f
Merged pull request #1728
7 years ago
Marc Zinnschlag
362aa23546
Merged pull request #1724
7 years ago
Marc Zinnschlag
2ab31b0c18
Merged pull request #1723
7 years ago
David Cernat
2942bf6455
Merge pull request #445 from OpenMW/master
...
Add OpenMW commits up to 6 Jun 2018
7 years ago
David Cernat
72862dc255
[General] Turn PlayerMap into WorldMap, now a Worldstate packet
7 years ago
David Cernat
6bb2a7e24a
Merge pull request #444 from TES3MP/0.6.3 while resolving conflicts
7 years ago
David Cernat
a28b27f5d9
Merge pull request #443 from OpenMW/master while resolving conflicts
...
# Conflicts:
# README.md
7 years ago
David Cernat
0d0c4ac235
[Client] Use REPLY_TO_REQUEST container sub-action for partial requests
7 years ago
David Cernat
04a2025340
Fix crash when adding items to certain disabled creatures (bug #4441 )
7 years ago
David Cernat
83014d6381
[Client] Set actors as the owners of their items when editing containers
7 years ago
David Cernat
494edbe5cb
[General] Add REPLY_TO_REQUEST container sub-action
7 years ago
David Cernat
8ea9485e6b
[Client] Make container debug information more useful
7 years ago
David Cernat
c20a0c72c5
Merge pull request #442 from OpenMW/master while resolving conflicts
...
# Conflicts:
# CMakeLists.txt
7 years ago
Marc Zinnschlag
cd7268e9af
Merge remote-tracking branch 'akortunov/effectResistFix' into openmw-44
7 years ago
Capostrophic
c14536a399
Update faction-owned items confiscation
7 years ago
Capostrophic
3810ade67a
Don't make unnecessary faction ID searches
7 years ago
Capostrophic
191cc76378
Consider faction ownerships in item stolen checks ( fixes #4293 )
7 years ago
elsid
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
Andrei Kortunov
be394870e4
Fix regressions in spell resistance
7 years ago
Andrei Kortunov
84c8fb9df7
Add pursue package only when crime was reported (bug #4433 )
7 years ago
Andrei Kortunov
24863f620b
RotateWorld: rotate around world axis (bug #4426 )
7 years ago
David Cernat
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
David Cernat
669d4d3d7e
Merge pull request #440 from OpenMW/master
...
Add OpenMW commits up to 27 May 2018
7 years ago
David Cernat
3efe05a88e
[General] Implement WorldCollisionOverride packet
7 years ago
David Cernat
5d30a884ba
[Client] Add Worldstate to CMakeLists
7 years ago
David Cernat
e8ec031a81
[Client] Create Worldstate class that inherits BaseWorldstate
7 years ago
scrawl
cfdf99f601
Revert "Merged pull request #1573"
...
This reverts commit 7324bd368f
, reversing
changes made to 810e4416f6
.
7 years ago
scrawl
99ffaafe30
Revert "Merge pull request #1701 from akortunov/standfix"
...
This reverts commit da47fc79f5
, reversing
changes made to 7324bd368f
.
7 years ago
Marc Zinnschlag
b151a89528
Merged pull request #1568
7 years ago
David Cernat
f7a084c824
[Client] Use faster check for whether actors are DedicatedPlayers
7 years ago
David Cernat
c8ec77875c
[Client] Update old comments for changes made by tes3mp
7 years ago
Marc Zinnschlag
832b4bb778
Merged pull request #1659
7 years ago
David Cernat
416ee77639
[General] Add placeholder for WorldCollisionOverride packet
7 years ago
David Cernat
2edb511a0b
[Client] Remove unnecessary condition from WorldTime processor
7 years ago
David Cernat
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