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
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
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
Andrei Kortunov
94c0e3ed10
Move toUpper() from StringUtils to the JournalViewModel
2017-11-23 19:37:45 +04:00
David Cernat
1ee460bba8
Merge pull request #344 from TES3MP/master
...
Add master commits up to 23 Nov 2017
2017-11-23 04:53:27 +02:00
David Cernat
656453725b
Merge pull request #343 from OpenMW/master
...
Add OpenMW commits up to 23 Nov 2017
2017-11-23 04:51:13 +02:00
Andrei Kortunov
67acb83b62
Add missing include
2017-11-21 13:27:33 +04:00
Andrei Kortunov
5f41f7c48d
Clean code up a bit
2017-11-21 13:03:38 +04:00
Andrei Kortunov
ba91cd658b
Convert topic name to Unicode
2017-11-21 12:31:23 +04:00
Andrei Kortunov
f0ca3eabd3
Merge from upstream master
2017-11-21 09:39:54 +04:00
scrawl
9fda3b6db4
Fix NumericEditBox behavior broken by switch to std::stoi
...
For some reason stoi doesn't throw an error for '1foo' while 'foo1' does.
Now the edit box flat out rejects any non-digit key events.
2017-11-20 23:20:03 +00:00
Andrei Kortunov
a391990f2a
Provide multibyte toLower() and single chars comparator
2017-11-20 21:30:46 +04:00
David Cernat
926106cf8c
[General] Rework CharGen slightly for clarity purposes
...
Previously, charGenStage.end was doing double duty as both the variable indicating the number of CharGen stages and – when set to 0 – the variable indicating that CharGen was over. The latter role is now filled by a new boolean.
2017-11-13 05:33:27 +02:00
Alexander Stillich
93e9df15c9
Fixed parameter naming
2017-11-11 22:58:02 +00:00
Alexander Stillich
52b3507a2b
Removed escape_hash_filter::mPrevious, removed usage of boost::replace_all
2017-11-11 22:58:02 +00:00
Alexander Stillich
09aac22782
Added StringUtil::replaceAll()
2017-11-11 22:58:01 +00:00
Alexander Stillich
92aaff3b78
Fixed escaping @ in boost program options filter
2017-11-11 22:57:59 +00:00
David Cernat
700e4d032e
Merge pull request #334 from TES3MP/master
...
Add master commits up to 11 Nov 2017
2017-11-11 03:47:22 +02:00
David Cernat
01db219de4
Merge pull request #333 from OpenMW/master
...
Add OpenMW commits up to 11 Nov 2017
2017-11-11 03:46:21 +02:00
scrawl
a5ba1caed1
Merge pull request #1541 from astillich/4189
...
Fixed escaping @ in boost program options filter
2017-11-10 23:08:54 +00:00
scrawl
a5adc5b018
Add NPC base skeleton files to the optimizer blacklist ( Fixes #4159 )
2017-11-10 22:51:32 +00:00
David Cernat
4dbada69bf
Merge pull request #332 from TES3MP/master while resolving conflicts
2017-11-10 08:50:28 +02:00
David Cernat
f2a6957e16
Merge pull request #331 from OpenMW/master while resolving conflicts
2017-11-10 08:43:50 +02:00
scrawl
244cc5b861
Reduce error spam
2017-11-08 00:24:03 +00:00
scrawl
7b4add2ae4
Fall back to non-shader material if creating the shader fails
...
Also fixes an uncaught exception that will break the whole game.
2017-11-08 00:24:03 +00:00
Alexander Stillich
43b5c2e36b
Fixed parameter naming
2017-11-07 23:20:10 +01:00
Alexander Stillich
70d578d050
Removed escape_hash_filter::mPrevious, removed usage of boost::replace_all
2017-11-07 23:10:58 +01:00
Alexander Stillich
af3e1f92ec
Added StringUtil::replaceAll()
2017-11-07 23:06:23 +01:00
Koncord
7ab01b66e4
[General] Rewrite Log class
2017-11-07 05:34:55 +08:00
Koncord
d15c674584
[General] Move getFilenameTimestamp() to Utils
2017-11-07 05:33:10 +08:00
Alexander Stillich
7d39c5450c
Fixed escaping @ in boost program options filter
2017-11-05 22:14:16 +01:00
David Walley
41dc82abad
Update Links to Documentation in settings.cfg files ( #1523 )
...
* Update settings-default.cfg
* Update settings.cpp
2017-10-28 16:05:30 +00:00
David Cernat
b801cf2c9e
Merge pull request #327 from TES3MP/master
...
Add master commits up to 26 Oct 2017
2017-10-26 17:34:00 +03:00
David Cernat
37304655da
Merge pull request #326 from OpenMW/master
...
Add OpenMW commits up to 25 Oct 2017
2017-10-26 17:28:56 +03:00
