David Cernat
ac374a8ef9
Merge pull request #384 from TES3MP/0.6.3 while resolving conflicts
...
Conflicts:
apps/openmw-mp/Player.cpp
apps/openmw-mp/Script/Functions/Mechanics.cpp
apps/openmw-mp/Script/Functions/Mechanics.hpp
apps/openmw-mp/Script/Functions/Quests.cpp
apps/openmw-mp/Script/Functions/Quests.hpp
apps/openmw-mp/Script/ScriptFunctions.hpp
apps/openmw-mp/processors/player/ProcessorRecordDynamic.hpp
apps/openmw/mwmp/LocalPlayer.hpp
apps/openmw/mwmp/WorldEvent.cpp
apps/openmw/mwworld/worldimp.cpp
components/openmw-mp/Base/BasePlayer.hpp
7 years ago
David Cernat
74765b3ace
[General] Implement selected spell sync as part of PlayerMiscellaneous
7 years ago
David Cernat
029dfc56ba
[General] Implement player scale as part of PlayerShapeshift
7 years ago
David Cernat
66078bfea7
[General] Implement Mark location sync as part of PlayerMiscellaneous
7 years ago
David Cernat
989f6e6b51
[General] Implement PlayerReputation packet
7 years ago
David Cernat
bdafa8e9ab
Merge pull request #380 from TES3MP/0.6.3
...
Add 0.6.3 commits up to 30 Jan 2018
7 years ago
David Cernat
3d80e2db62
[General] Add placeholders for new packet types, part 2
7 years ago
David Cernat
5858e05362
Merge pull request #378 from TES3MP/0.6.3 while resolving conflicts
...
Conflicts:
apps/openmw-mp/CMakeLists.txt
apps/openmw-mp/Script/ScriptFunctions.hpp
components/CMakeLists.txt
7 years ago
David Cernat
273a1f50af
Merge pull request #377 from OpenMW/master
...
Add OpenMW commits up to 29 Jan 2018
7 years ago
David Cernat
02af7f6ba1
[General] Add placeholders for new packet types
7 years ago
scrawl
25a6a67508
Fix the optimizer messing up LOD node's children ( Fixes #4301 )
7 years ago
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
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
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
Ilya Zhuravlev
9e9f6f3132
loadtes3: don't pack() non-POD structs
7 years ago
Koncord
6197636fac
[General] Fix "using after move" warning
7 years ago
Koncord
0e97b769f9
[General] Change type of Object::enchantmentCharge
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
0780329a59
[General] Fix typo
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
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
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
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
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
scrawl
047c44f265
Ignore duplicate data directories to work around the fallout of ( Fixes #3557 )
7 years ago
scrawl
259919d125
Print a warning when an ambiguous file on a case-sensitive file system is found
7 years ago
Marc Zinnschlag
2dff3aab22
allow . and - in the name part of a begin script statement, but not at the beginning of a name. Fixes #4061
7 years ago
scrawl
bba9a8dd91
Don't update off-screen animations
...
Make flying creatures animate in-place when out of processing range
7 years ago
Kyle Cooley
7248a5d037
Remove some duplication, standardize sol2 header inclusion
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
Koncord
ef0384b296
[General] Simplify ProxyMasterPacket
7 years ago
Koncord
647661daf9
[General] Minor fixes in Master packets
7 years ago
David Cernat
a818140c14
Merge pull request #365 from OpenMW/master
...
Add OpenMW commits up to 2 Jan 2017
7 years ago
David Cernat
65d978a3cb
Merge pull request #364 from OpenMW/master
...
Add OpenMW commits up to 1 Jan 2017
7 years ago
Koncord
c4949ac5d9
[General] Change regular enums to enum class
7 years ago
Koncord
5777759aae
[General] Change enum QuickKey::QUICKKEY_TYPE to enum class
7 years ago
Bret Curtis
93f14c219c
camelCase
7 years ago
Bret Curtis
7a7b040216
fix building on mips machines
7 years ago