David Cernat
d70b93e095
Merge pull request #373 from TES3MP/0.6.2 while resolving conflicts
...
# Conflicts:
# apps/openmw/mwmp/DedicatedActor.cpp
# apps/openmw/mwmp/processors/player/ProcessorPlayerResurrect.hpp
7 years ago
David Cernat
d7e29f1f61
[Client] Unequip items with constant effect damage when resurrected
7 years ago
David Cernat
d19d8b0a34
[Client] Add and use enchantmentType argument for unequipItemsByEffect()
7 years ago
David Cernat
6c4bb8c423
[Client] Move resurrection code for local player to LocalPlayer
7 years ago
David Cernat
6b75a82777
[Client] Ignore equipment items for DedicatedActors with count below 0
7 years ago
David Cernat
e3bc11d9eb
[Client] Fix ListBox overlap crashes by removing ListBoxes properly
7 years ago
David Cernat
c6a85ee8f9
[Client] Add doesEffectListContainEffect() method to MechanicsHelper
7 years ago
David Cernat
aa392ebf20
[Client] Unequip items if necessary when attr/skill modifier is set to 0
7 years ago
David Cernat
ace825b99c
[Client] Ignore invalid player class IDs from packets
...
Additionally, clean up variables names in related code.
7 years ago
David Cernat
c6874509b6
[Client] Ignore invalid faction IDs from packets
7 years ago
David Cernat
a037193e79
Merge pull request #372 from TES3MP/0.6.2 while resolving conflicts
...
Conflicts:
apps/openmw-mp/Script/Functions/Actors.cpp
apps/openmw-mp/Script/Functions/Actors.hpp
apps/openmw-mp/Script/Functions/Items.cpp
apps/openmw-mp/Script/Functions/Items.hpp
apps/openmw-mp/Script/Functions/World.cpp
apps/openmw-mp/Script/Functions/World.hpp
apps/openmw/mwmp/WorldEvent.cpp
components/openmw-mp/Packets/Player/PacketPlayerEquipment.cpp
components/openmw-mp/Version.hpp
7 years ago
David Cernat
5894ffae7d
[Client] Ignore dynamic object placements or spawns in packets
7 years ago
David Cernat
f746958afa
[Client] Send enchantmentCharge for items added or removed in containers
7 years ago
David Cernat
bce3d0eb4c
[Client] Use more descriptive message for version mismatch
7 years ago
David Cernat
92060bd6b6
Merge pull request #370 from TES3MP/0.6.2
...
Add 0.6.2 commits up to 10 Jan 2018
7 years ago
David Cernat
14ef2fa791
Merge pull request #369 from OpenMW/master
...
Add OpenMW commits up to 9 Jan 2018
7 years ago
scrawl
c7f60a6dc8
Merge pull request #1595
7 years ago
scrawl
f6ca7295a6
Revert "Merge pull request #1595"
...
This reverts commit 7ef7b1a7b1
, reversing
changes made to 9e7e4de0ab
.
7 years ago
scrawl
7ef7b1a7b1
Merge pull request #1595
7 years ago
scrawl
9e7e4de0ab
Merge pull request #1594
7 years ago
Andrei Kortunov
dba071f881
Remove the 'Screenshot saved' message (bug #4191 )
7 years ago
David Cernat
8316ec0fa7
[Client] Update tes3mp change comment for object rescaling
7 years ago
David Cernat
09548d05f7
[Client] Ignore cell changes that move actors to where they already are
7 years ago
David Cernat
4a9a628a0f
[Client] When getting an actor, make sure their cell is initialized
7 years ago
David Cernat
4caf7ca30a
[Client] Add temporary fix for crashes caused by custom GUI elements
7 years ago
David Cernat
0cc86c04d1
[Client] Print plugin discrepancies, not just plugin lists side by side
7 years ago
Kyle Cooley
ba4d2bd5fe
Merge remote-tracking branch 'origin/master' into LibIssues
7 years ago
David Cernat
b6a7377692
Merge pull request #366 from TES3MP/0.6.2 while resolving conflicts, 2nd try
...
Conflicts:
apps/openmw-mp/Networking.cpp
apps/openmw-mp/Script/Functions/Miscellaneous.cpp
apps/openmw-mp/Script/Functions/Miscellaneous.hpp
apps/openmw/mwmp/GUI/GUIChat.cpp
7 years ago
Kyle Cooley
fcd4d8b842
Fix build for gcc-5.4.0
7 years ago
Koncord
35922e4898
[General] Change "enum ACTOR_ACTION" to "enum class Action"
7 years ago
David Cernat
a639d3494a
[Client] Fix use of DedicatedPlayers as targets for ConsoleCommand
7 years ago
David Cernat
502df7d9c1
[Client] Clean up GUIChat slightly
7 years ago
David Cernat
a818140c14
Merge pull request #365 from OpenMW/master
...
Add OpenMW commits up to 2 Jan 2017
7 years ago
Thunderforge
bd072b131b
Moving controller file out of the controllers subdirectory
7 years ago
Andrei Kortunov
b277b83810
Display the 'Screenshot saved' message after the screenshot saving (bug #4191 )
7 years ago
Bret Curtis
c3c3fbc68e
overriden -> overridden
7 years ago
David Cernat
65d978a3cb
Merge pull request #364 from OpenMW/master
...
Add OpenMW commits up to 1 Jan 2017
7 years ago
David Cernat
bca9c55046
[Client] Reinstate "Merge pull request #1529 from drummyfish/animfix"
...
This reverts commit 2f4cd6b713
and adds back the changes made by 45993d3da2
because the OpenMW issue at https://bugs.openmw.org/issues/4250 has been fixed by 57257d057f
7 years ago
Koncord
c4949ac5d9
[General] Change regular enums to enum class
7 years ago
Thunderforge
3f7143556a
Providing different mappings depending on the version of SDL installed
7 years ago
Koncord
5777759aae
[General] Change enum QuickKey::QUICKKEY_TYPE to enum class
7 years ago
David Cernat
51a92bcf8f
[Client] Fix build
7 years ago
David Cernat
09958681cd
Merge pull request #363 from TES3MP/0.6.2 while resolving conflicts, 2nd try
7 years ago
scrawl
57257d057f
Remove unintended jump cooldown ( Fixes #4250 )
7 years ago
David Cernat
2f4cd6b713
[Client] Revert "Merge pull request #1529 from drummyfish/animfix"
...
This reverts commit 45993d3da2
, reversing
changes made to 3d347730dc
.
That commit made players have to wait around 1.5 seconds after each jump before doing a new one.
It will be reinstated once its accompanying OpenMW issue at https://bugs.openmw.org/issues/4250 is fixed.
7 years ago
David Cernat
db0e0d376e
[Client] Use new code to set the console's Ptrs from server scripts
...
Previously, reusing the console's object selection code made it so using the same Ptr twice in a row was akin to clicking on the same object twice in the console window, i.e. the object was deselected the second time around. Additionally, that same code was setting key focus to the hidden console window, preventing players from moving until they activated another window (such as their inventory or chat window).
7 years ago
David Cernat
dddd2f1cc7
Merge pull request #361 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .travis.yml
7 years ago
David Cernat
5fd9079b26
[Client] Stop drag and drop when setting player inventory
7 years ago
David Cernat
40e70ebf9c
[Client] Fix key focus for chat window
7 years ago
David Cernat
bed96e5a3d
[Client] Remove check of GM_RestBed GUI mode that no longer exists
7 years ago