Koncord
f1e2bc01f6
[General] Use floats instead of doubles for enchantmentCharge
2018-01-19 15:41:29 +08:00
Koncord
1e25a122c9
[General] Use RELIABLE_ORDERED only when jumping
2018-01-19 15:36:57 +08:00
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
2018-01-18 13:40:13 +02:00
David Cernat
28f47c4f81
[General] Update version to 0.6.2-hotfixed
2018-01-17 08:10:49 +02:00
David Cernat
9935f56d46
[General] Use doubles instead of ints for enchantmentCharge
...
Additionally, include enchantmentCharges for items in PlayerEquipment packets.
2018-01-17 08:10:49 +02:00
Kyle Cooley
7248a5d037
Remove some duplication, standardize sol2 header inclusion
2018-01-05 20:25:57 -05:00
Kyle Cooley
ba4d2bd5fe
Merge remote-tracking branch 'origin/master' into LibIssues
2018-01-05 17:35:47 -05:00
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
2018-01-05 21:24:14 +02:00
Kyle Cooley
fcd4d8b842
Fix build for gcc-5.4.0
2018-01-04 21:41:00 -05:00
Koncord
35922e4898
[General] Change "enum ACTOR_ACTION" to "enum class Action"
2018-01-05 09:40:11 +08:00
Koncord
ef0384b296
[General] Simplify ProxyMasterPacket
2018-01-05 09:06:24 +08:00
Koncord
647661daf9
[General] Minor fixes in Master packets
2018-01-05 08:38:40 +08:00
David Cernat
a818140c14
Merge pull request #365 from OpenMW/master
...
Add OpenMW commits up to 2 Jan 2017
2018-01-04 12:12:18 +02:00
David Cernat
65d978a3cb
Merge pull request #364 from OpenMW/master
...
Add OpenMW commits up to 1 Jan 2017
2018-01-02 07:50:37 +02:00
Koncord
c4949ac5d9
[General] Change regular enums to enum class
2018-01-02 12:44:53 +08:00
Koncord
5777759aae
[General] Change enum QuickKey::QUICKKEY_TYPE to enum class
2018-01-02 11:52:38 +08:00
Bret Curtis
93f14c219c
camelCase
2018-01-01 16:32:20 +01:00
Bret Curtis
7a7b040216
fix building on mips machines
2018-01-01 14:10:23 +01:00
David Cernat
09958681cd
Merge pull request #363 from TES3MP/0.6.2 while resolving conflicts, 2nd try
2018-01-01 12:04:25 +02:00
scrawl
c920f95d1e
Don't incorrectly discard root node transformation ( Fixes #4272 )
2017-12-31 23:49:43 +00:00
David Cernat
cac2c6c1e8
Merge pull request #360 from TES3MP/0.6.1-openmw-updates while resolving conflicts
2017-12-25 02:25:01 +02:00
David Cernat
993081ba1e
[General] Add enchantmentCharge to worldObjects and items
2017-12-23 13:16:38 +02:00
Koncord
077a3d06b3
[General] Change type of BasePlayer::resurrectType to ResurrectType
2017-12-10 12:01:04 +08:00
Koncord
1ef6ad6215
[General] Add weather struct and packet
2017-12-10 09:48:29 +08:00
Koncord
122a30c183
[General] Change type of refNumIndex & mpNum to unsigned
2017-12-10 09:20:13 +08:00
Koncord
f35d35741e
[General] Remove redundant code
...
Remove BaseEvent::worldObjectCount
Remove BaseActor::count
Use foreach loops in packets and processors
Remove redundant "&" in CellController::get().getCell() calls
2017-12-09 14:59:41 +08:00
Koncord
2cb0ea20f0
[General] Modernize packets
...
Use explicit for constructors
Use override instead virtual for inherited methods
Mark final derived classes as "final"
2017-12-09 10:13:27 +08:00
Koncord
aa183e6844
[General] Introduce chat channels
2017-12-08 07:43:29 +08:00
David Cernat
fc5e883160
[General] Rework PlayerStatsDynamic packets so they are of minimal size
2017-12-02 18:29:30 +02:00
David Cernat
d1ad0c91f8
[General] Rework PlayerEquipment packets so they are of minimal size
...
Moreover, rename BaseNetCreature's equipedItems into equipmentItems.
2017-11-30 12:31:54 +02:00
David Cernat
c9c363ebef
[General] Allow GameSettings to set bed & wilderness resting separately
2017-11-30 12:18:15 +02:00
David Cernat
7e322f1f8b
Merge pull request #352 from TES3MP/master while resolving conflicts
...
# Conflicts:
# README.md
2017-11-30 10:10:38 +02:00
David Cernat
e7f20e7daf
Merge pull request #351 from OpenMW/master while resolving conflicts
...
# Conflicts:
# CMakeLists.txt
# README.md
2017-11-30 10:06:38 +02:00
scrawl
a4d8aef40d
Merge branch openmw-43 into master
...
Conflicts:
CMakeLists.txt
README.md
files/mygui/openmw_trade_window.layout
2017-11-29 22:37:50 +00:00
David Cernat
bd9e8bd10f
[General] Simplify storing of attribute and skill index changes
2017-11-29 16:55:51 +02:00
David Cernat
711bdf187a
[General] Add BaseNetCreature to CMakeLists in components
2017-11-29 16:11:15 +02:00
David Cernat
720ef5f6c5
[General] Use consistent code style
2017-11-29 13:00:22 +02:00
Koncord
b55bb445dd
[General] Change underlying type of the WidgetType to uint8_t
2017-11-28 22:24:04 +08:00
Koncord
a546d99000
[General] Fix type
2017-11-28 22:10:27 +08:00
Koncord
1841562553
[General] Minor cleanup of the World Packets
2017-11-28 22:05:10 +08:00
Koncord
744b8cf168
[General] Minor cleanup of the Actor Packets
2017-11-28 21:51:34 +08:00
Koncord
e44fcdc0b3
[General] Cleanup Player packets
2017-11-28 21:38:45 +08:00
David Cernat
3508a16836
[General] Use GameSettings packet to set ability to rest and wait
2017-11-27 07:39:02 +02:00
David Cernat
a796f81444
[General] Add and use utility function for int value checks in vectors
2017-11-26 13:03:54 +02:00
Koncord
fef3764eb1
[General] Add forgotten files to build
2017-11-25 23:55:05 +08:00
Koncord
c276ff4bd9
[General] Add packet GUIWindow
2017-11-25 23:37:08 +08:00
David Cernat
0a35b897be
Merge pull request #348 from TES3MP/master
...
Add master commits up to 25 Nov 2017
2017-11-25 08:55:18 +02:00
David Cernat
d06817a356
Merge pull request #347 from OpenMW/master
...
Add OpenMW commits up to 25 Nov 2017
2017-11-25 08:54:22 +02:00
David Cernat
b0965f094a
[General] Rework PlayerAttribute packets so they are of minimal size
...
Previously, whenever a single attribute value changed for a player, that player then sent a PlayerAttribute packet with all values for all 8 attributes.
This did not cause anywhere as much packet spam as PlayerSkill used to, but there was no good reason not to fix it as well.
2017-11-24 14:28:05 +02:00
David Cernat
ef79a98544
[General] Rework PlayerSkill packets so they are of minimal size
...
Previously, whenever a single skill value changed for a player, that player then sent a PlayerSkill packet with all values for all 27 skills, plus the player's progress towards the next level and the bonuses to each attribute on the next level up as the result of sklll increases thus far.
This commit makes PlayerSkill contain only the values of specific skills, moves the player's progress towards the next level to PlayerLevel packets, and moves the bonuses to each attribute on the next level up to PlayerAttribute packets.
Players now also send a PlayerSkill packet whenever their progress towards a new point in a skill changes. This was previously avoided so as to not have massive packet spam.
2017-11-24 12:38:42 +02:00
