Commit Graph

20771 Commits (b6a737769275e0343e8f18956ea3922e85e9d1ef)
 

Author SHA1 Message Date
scrawl b12cd1f5b2
Merge pull request #1581 7 years ago
Miloslav Číž c979a9e34f
Merge branch 'master' into cs-cam 7 years ago
Miloslav Číž 199e41833f
Merge branch 'master' into cs-cam 7 years ago
Miloslav Číž d85f8deaa3 CS: Add fixed roll setting, plus ortho fix 7 years ago
Miloslav Číž 1b77e3ed62 CS: Add ortho camera setting 7 years ago
Miloslav Číž bfad5ebde4 CS: Fix camera orbit control with keys 7 years ago
David Cernat ad61d88cb1 [General] Fix typos and use consistent style for recent additions 7 years ago
Chris Robinson aecf74e7bb Don't throw exceptions from the audio decoder 7 years ago
Koncord 051f65a4d5 [Client] Make channel buttons blinking on new messages 7 years ago
Koncord 7eecbfd08e [Client] Fix saving channel history 7 years ago
Koncord 1c7330635b [Server] Add & register ON_PLAYER_WEATHER event 7 years ago
Koncord 392e645fe5 [Server] Add isMarkedForDeleteion function 7 years ago
Koncord 91398c5dcc [Server] Implicitly join to "Default" channel 7 years ago
Koncord aa183e6844 [General] Introduce chat channels 7 years ago
Koncord c55f0f73b8 [Server] Pass shared_ptr<Player> by reference 7 years ago
Miloslav Číž 5e076ee015 CS: Fix camera orbit with arbitrary roll 7 years ago
Miloslav Číž cfdc6c788e CS: Make camera FOV change dynamically 7 years ago
Miloslav Číž 7d36dd68dc CS: Make orbit camera not change roll 7 years ago
Miloslav Číž 360d786ff2 CS: Add rendering prefs and camera FOV 7 years ago
Andrei Kortunov 744859f327 Take in account armor condition in the armor rating calculation (bug #4246) 7 years ago
David Cernat 85a9181c12
Merge pull request #355 from OpenMW/master
Add OpenMW commits up to 6 Dec 2017
7 years ago
Koncord 94f3eaa980 [Server] Fix warning "implicit fallthrough" 7 years ago
Allofich 7e87ce8787 Prevent combat on/off cycling for calmed actors 7 years ago
Allofich e0c54b3f39 Stop guards trying to arrest player when calm
(Fixes #3863)
7 years ago
Andrei Kortunov a28cc37501 Do not sell ingredients from organic containers 7 years ago
scrawl d2b3f902c7
Merge pull request #1576 7 years ago
Andrei Kortunov 29b2308b2c Do not display cyrillic soft/hard signs in the journal index 7 years ago
Andrei Kortunov b6ae7f3cc8 Do not add greetings to the journal index (bug #4342) 7 years ago
scrawl 441420225f
Contributing.md: referencing issues in commit messages 7 years ago
David Cernat e97c9f72a2 [General] Rework getting/clearing of skill modifiers as with attributes 7 years ago
David Cernat 456bcee68a [Server] Use Utils function as workaround for "bad exception" on Windows 7 years ago
David Cernat cfb5835e17 [Server] Clean up method and variable names 7 years ago
Koncord cd03d59056 [Client] Fix invalid read (memcheck warning) 7 years ago
David Cernat 2bc79fcdf4
Merge pull request #309 from TES3MP/new-script-api
Add new-script-api commits
7 years ago
David Cernat c2f330d4f1
Merge pull request #354 from TES3MP/master
Add master commits up to 4 Dec 2017
7 years ago
David Cernat 07f0cc2b0e
Merge pull request #353 from OpenMW/master
Add OpenMW commits up to 4 Dec 2017
7 years ago
scrawl 58de366c21
Merge pull request #1574 7 years ago
scrawl ff1226c96b
Merge pull request #1575 7 years ago
Andrei Kortunov 8decd35607 Fixes crash on quickload from the container menu (bug #4239) 7 years ago
Alexander "Ace" Olofsson 50deed126b
Update SDL to 2.0.7 7 years ago
David Cernat fc5e883160 [General] Rework PlayerStatsDynamic packets so they are of minimal size 7 years ago
David Cernat 993cc3dfd6 [Server] Rename server "plugins"/"mods" into "modules" for clarity
The terms "plugins" and "mods" were used interchangeably to refer to collections of server scripts, which was bound to cause confusion later on, especially with client data files frequently being referred to as "plugins" and "mods" as well.

Moreover, the server configuration file now starts its manual ordering with "Module1" for consistency with the pluginlist.json (soon to be dataFileList.json) of the CoreScripts.
7 years ago
David Cernat 047ad40b96 [Client] Clear FortifyAttribute effects when server sets modifier to 0 7 years ago
David Cernat 2944be18ae [Server] Actually, turn SetAttributeModifier into ClearAttributeModifier
There's no way SetAttributeModifier() was going to make sense if, say, a player had drunk 3 different potions fortifying the same attribute and was wearing equipment fortifying it as well. How would one change the sum modifier of those while accounting for each specific effect's duration and magnitude?

The only workable solution is to allow the server to clear the modifier.
7 years ago
David Cernat ef6dc61797 [Client] Send PlayerAttribute packets when attribute modifiers change 7 years ago
David Cernat e8d636ebc3 [Server] Rework Get/SetAttributeCurrent into Get/SetAttributeModifier
As seen here, attributes don't use the concept of current values, but rather of value modifiers and value damage:

https://github.com/OpenMW/openmw/blob/master/apps/openmw/mwmechanics/stat.cpp#L217
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