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
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
David Cernat
09958681cd
Merge pull request #363 from TES3MP/0.6.2 while resolving conflicts, 2nd try
7 years ago
scrawl
c920f95d1e
Don't incorrectly discard root node transformation ( Fixes #4272 )
7 years ago
David Cernat
cac2c6c1e8
Merge pull request #360 from TES3MP/0.6.1-openmw-updates while resolving conflicts
7 years ago
David Cernat
993081ba1e
[General] Add enchantmentCharge to worldObjects and items
7 years ago
Koncord
077a3d06b3
[General] Change type of BasePlayer::resurrectType to ResurrectType
7 years ago
Koncord
1ef6ad6215
[General] Add weather struct and packet
7 years ago
Koncord
122a30c183
[General] Change type of refNumIndex & mpNum to unsigned
7 years ago
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
7 years ago
Koncord
2cb0ea20f0
[General] Modernize packets
...
Use explicit for constructors
Use override instead virtual for inherited methods
Mark final derived classes as "final"
7 years ago
Koncord
aa183e6844
[General] Introduce chat channels
7 years ago
David Cernat
fc5e883160
[General] Rework PlayerStatsDynamic packets so they are of minimal size
7 years ago
David Cernat
d1ad0c91f8
[General] Rework PlayerEquipment packets so they are of minimal size
...
Moreover, rename BaseNetCreature's equipedItems into equipmentItems.
7 years ago
David Cernat
c9c363ebef
[General] Allow GameSettings to set bed & wilderness resting separately
7 years ago
David Cernat
7e322f1f8b
Merge pull request #352 from TES3MP/master while resolving conflicts
...
# Conflicts:
# README.md
7 years ago
David Cernat
e7f20e7daf
Merge pull request #351 from OpenMW/master while resolving conflicts
...
# Conflicts:
# CMakeLists.txt
# README.md
7 years ago
scrawl
a4d8aef40d
Merge branch openmw-43 into master
...
Conflicts:
CMakeLists.txt
README.md
files/mygui/openmw_trade_window.layout
7 years ago
David Cernat
bd9e8bd10f
[General] Simplify storing of attribute and skill index changes
7 years ago
David Cernat
711bdf187a
[General] Add BaseNetCreature to CMakeLists in components
7 years ago
David Cernat
720ef5f6c5
[General] Use consistent code style
7 years ago
Koncord
b55bb445dd
[General] Change underlying type of the WidgetType to uint8_t
7 years ago
Koncord
a546d99000
[General] Fix type
7 years ago
Koncord
1841562553
[General] Minor cleanup of the World Packets
7 years ago
Koncord
744b8cf168
[General] Minor cleanup of the Actor Packets
7 years ago
Koncord
e44fcdc0b3
[General] Cleanup Player packets
7 years ago
David Cernat
3508a16836
[General] Use GameSettings packet to set ability to rest and wait
7 years ago
David Cernat
a796f81444
[General] Add and use utility function for int value checks in vectors
7 years ago
Koncord
fef3764eb1
[General] Add forgotten files to build
7 years ago
Koncord
c276ff4bd9
[General] Add packet GUIWindow
7 years ago
David Cernat
0a35b897be
Merge pull request #348 from TES3MP/master
...
Add master commits up to 25 Nov 2017
7 years ago
David Cernat
d06817a356
Merge pull request #347 from OpenMW/master
...
Add OpenMW commits up to 25 Nov 2017
7 years ago
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.
7 years ago
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.
7 years ago
Andrei Kortunov
94c0e3ed10
Move toUpper() from StringUtils to the JournalViewModel
7 years ago
David Cernat
1ee460bba8
Merge pull request #344 from TES3MP/master
...
Add master commits up to 23 Nov 2017
7 years ago
David Cernat
656453725b
Merge pull request #343 from OpenMW/master
...
Add OpenMW commits up to 23 Nov 2017
7 years ago
David Cernat
6668b9ab42
[General] Implement ConsoleCommand packet
7 years ago
Andrei Kortunov
67acb83b62
Add missing include
7 years ago
Andrei Kortunov
5f41f7c48d
Clean code up a bit
7 years ago
Andrei Kortunov
ba91cd658b
Convert topic name to Unicode
7 years ago
Andrei Kortunov
f0ca3eabd3
Merge from upstream master
7 years ago