David Cernat
1a8a518897
Merge pull request #376 from TES3MP/0.6.3 while resolving conflicts
...
Conflicts:
README.md
apps/openmw-mp/Script/Functions/World.cpp
apps/openmw/mwmp/LocalPlayer.cpp
apps/openmw/mwmp/LocalPlayer.hpp
apps/openmw/mwworld/scene.cpp
components/openmw-mp/Version.hpp
7 years ago
David Cernat
78df8c5ebe
Merge pull request #375 from OpenMW/master
...
Add OpenMW commits up to 29 Jan 2018
7 years ago
scrawl
89c6b59c30
Merge pull request #1602
7 years ago
David Cernat
ce11a1dfa9
[Client] Fix potential invalid pointer when storing cell unloads
...
Notably, builds of the client done with Clang were crashing on startup before this.
7 years ago
David Cernat
420dab10e1
[General] Track objects directly placed by players in ObjectPlace
...
This allows the OnPCDrop variable to get set correctly even when object placements have to go through the server first in order to gain a unique multiplayer index (mpNum).
Among other things, this makes it possible to roll marijuana joints in the popular mod "Tribunal Code Patch".
7 years ago
David Cernat
595bc5a152
[Client] Only send ObjectScale packets when scale actually changes
7 years ago
David Cernat
613adf6b30
[General] Update version to 0.6.3
7 years ago
David Cernat
5d4b97645d
Merge pull request #374 from OpenMW/master while resolving conflicts
...
# Conflicts:
# apps/openmw/CMakeLists.txt
7 years ago
David Cernat
569911121d
[Client] Fix build
7 years ago
David Cernat
5cf71a4e67
Merge branch 'master' of https://github.com/TES3MP/openmw-tes3mp
7 years ago
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
Ilya Zhuravlev
9e9f6f3132
loadtes3: don't pack() non-POD structs
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
Ilya Zhuravlev
b4ec8aaf5e
VideoState::queue_picture: ffmpeg expects a buffer of 4 pointers in sws_scale
7 years ago
Koncord
6197636fac
[General] Fix "using after move" warning
7 years ago
Koncord
edd883853d
[Server] Add sendConsoleCommand function to lua api
7 years ago
Koncord
0e97b769f9
[General] Change type of Object::enchantmentCharge
7 years ago
Koncord
4cfb04aa7f
[Server] Fix setBedRestAllowed
7 years ago
Koncord
7e5b929ea2
[General] Rework PacketPlayerFaction
7 years ago
Koncord
29ba07fe8c
[General] Rework PacketPlayerInventory
...
Save the Action for each item. Now you can add or remove multiple items
7 years ago
Koncord
de0bb3cdab
[General] Change type of Item::enchantmentCharge to float
7 years ago
Koncord
cb86557aca
[Server] Init Player::inUpdateQueue
7 years ago
Koncord
0780329a59
[General] Fix typo
7 years ago
Koncord
1f1cbf53f9
[Client] Mark trivial destructor as default, remove "virtual" keyword
...
Mark constructor as explicit
7 years ago
Koncord
b63bf258ff
[Client] Remove "virtual" keyword for getLocalActor & getDedicatedActor
7 years ago
Koncord
c2578918f2
[Client] Do not copy strings in getLocalActor and getDedicatedActor
7 years ago
Koncord
e2e197d84a
[Client] Fix getting element of shared_ptr by reference
7 years ago
Koncord
f1e2bc01f6
[General] Use floats instead of doubles for enchantmentCharge
7 years ago
Koncord
1e25a122c9
[General] Use RELIABLE_ORDERED only when jumping
7 years ago
Ilya Zhuravlev
8d44d3124e
Android: Add callbacks for basic cursor handling.
7 years ago
Ilya Zhuravlev
359910762d
GraphicsWindowSDL2: support setting up GLESv2 context for android
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
Ilya Zhuravlev
455f718394
Android: register a virtual controller definition
7 years ago
Ilya Zhuravlev
a038327521
SDLCursorManager: fix possibly invalid read when no cursor present
...
On android we have no cursor so I moved the check closer to usage
7 years ago
David Cernat
5894ffae7d
[Client] Ignore dynamic object placements or spawns in packets
7 years ago
David Cernat
28f47c4f81
[General] Update version to 0.6.2-hotfixed
7 years ago
David Cernat
9935f56d46
[General] Use doubles instead of ints for enchantmentCharge
...
Additionally, include enchantmentCharges for items in PlayerEquipment 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
Bret Curtis
588c1df0f0
Merge pull request #1599 from xyzz/android
...
Update android port.
7 years ago
Ilya Zhuravlev
d2121ccd62
Update android port.
7 years ago
Thunderforge
36843ed31e
Adding a tutorial for placing the ring in plain sight ( #1598 )
...
* Rearranging sections
* Adding instructions to place the ring in plain sight
7 years ago