David Cernat
de77ee3126
Merge pull request #356 from OpenMW/master
...
Add OpenMW commits up to 7 Dec 2017
2017-12-08 23:08:34 +02:00
Miloslav Číž
e309dfd234
CS: Rename variables (AppVeyor fix)
2017-12-08 22:06:03 +01:00
scrawl
9cee439e37
Merge pull request #1577
2017-12-08 20:00:58 +00:00
scrawl
1d823d8ae1
Merge pull request #1579
2017-12-08 20:00:26 +00:00
scrawl
b12cd1f5b2
Merge pull request #1581
2017-12-08 20:00:15 +00:00
Miloslav Číž
c979a9e34f
Merge branch 'master' into cs-cam
2017-12-08 20:57:52 +01:00
Miloslav Číž
199e41833f
Merge branch 'master' into cs-cam
2017-12-08 20:56:05 +01:00
Miloslav Číž
d85f8deaa3
CS: Add fixed roll setting, plus ortho fix
2017-12-08 20:51:40 +01:00
Miloslav Číž
1b77e3ed62
CS: Add ortho camera setting
2017-12-08 18:18:27 +01:00
Miloslav Číž
bfad5ebde4
CS: Fix camera orbit control with keys
2017-12-08 17:42:20 +01:00
David Cernat
ad61d88cb1
[General] Fix typos and use consistent style for recent additions
2017-12-08 18:02:23 +02:00
Chris Robinson
aecf74e7bb
Don't throw exceptions from the audio decoder
2017-12-08 07:00:04 -08:00
Koncord
051f65a4d5
[Client] Make channel buttons blinking on new messages
2017-12-08 22:53:22 +08:00
Koncord
7eecbfd08e
[Client] Fix saving channel history
2017-12-08 22:36:16 +08:00
Koncord
1c7330635b
[Server] Add & register ON_PLAYER_WEATHER event
2017-12-08 20:38:36 +08:00
Koncord
392e645fe5
[Server] Add isMarkedForDeleteion function
2017-12-08 20:37:22 +08:00
Koncord
91398c5dcc
[Server] Implicitly join to "Default" channel
2017-12-08 20:35:19 +08:00
Koncord
aa183e6844
[General] Introduce chat channels
2017-12-08 07:43:29 +08:00
Koncord
c55f0f73b8
[Server] Pass shared_ptr<Player> by reference
2017-12-08 07:32:49 +08:00
Miloslav Číž
5e076ee015
CS: Fix camera orbit with arbitrary roll
2017-12-08 00:19:05 +01:00
Miloslav Číž
cfdc6c788e
CS: Make camera FOV change dynamically
2017-12-08 00:05:50 +01:00
Miloslav Číž
7d36dd68dc
CS: Make orbit camera not change roll
2017-12-07 23:52:05 +01:00
Miloslav Číž
360d786ff2
CS: Add rendering prefs and camera FOV
2017-12-07 23:48:34 +01:00
Andrei Kortunov
744859f327
Take in account armor condition in the armor rating calculation (bug #4246 )
2017-12-07 22:43:32 +04:00
David Cernat
85a9181c12
Merge pull request #355 from OpenMW/master
...
Add OpenMW commits up to 6 Dec 2017
2017-12-06 18:32:59 +02:00
Koncord
94f3eaa980
[Server] Fix warning "implicit fallthrough"
2017-12-06 13:30:39 +08:00
Allofich
7e87ce8787
Prevent combat on/off cycling for calmed actors
2017-12-06 01:03:24 +09:00
Allofich
e0c54b3f39
Stop guards trying to arrest player when calm
...
(Fixes #3863 )
2017-12-05 23:53:02 +09:00
Andrei Kortunov
a28cc37501
Do not sell ingredients from organic containers
2017-12-05 10:24:58 +04:00
scrawl
d2b3f902c7
Merge pull request #1576
2017-12-04 21:19:49 +00:00
Andrei Kortunov
29b2308b2c
Do not display cyrillic soft/hard signs in the journal index
2017-12-04 22:42:17 +04:00
Andrei Kortunov
b6ae7f3cc8
Do not add greetings to the journal index (bug #4342 )
2017-12-04 22:42:10 +04:00
scrawl
441420225f
Contributing.md: referencing issues in commit messages
2017-12-04 17:00:02 +00:00
David Cernat
e97c9f72a2
[General] Rework getting/clearing of skill modifiers as with attributes
2017-12-04 15:06:27 +02:00
David Cernat
456bcee68a
[Server] Use Utils function as workaround for "bad exception" on Windows
2017-12-04 14:32:23 +02:00
David Cernat
cfb5835e17
[Server] Clean up method and variable names
2017-12-04 10:39:20 +02:00
Koncord
cd03d59056
[Client] Fix invalid read (memcheck warning)
2017-12-04 16:25:57 +08:00
David Cernat
2bc79fcdf4
Merge pull request #309 from TES3MP/new-script-api
...
Add new-script-api commits
2017-12-04 08:18:41 +02:00
David Cernat
c2f330d4f1
Merge pull request #354 from TES3MP/master
...
Add master commits up to 4 Dec 2017
2017-12-04 04:39:08 +02:00
David Cernat
07f0cc2b0e
Merge pull request #353 from OpenMW/master
...
Add OpenMW commits up to 4 Dec 2017
2017-12-04 04:38:38 +02:00
scrawl
58de366c21
Merge pull request #1574
2017-12-03 22:22:48 +00:00
scrawl
ff1226c96b
Merge pull request #1575
2017-12-03 22:22:29 +00:00
Andrei Kortunov
8decd35607
Fixes crash on quickload from the container menu (bug #4239 )
2017-12-03 21:49:13 +04:00
Alexander "Ace" Olofsson
50deed126b
Update SDL to 2.0.7
2017-12-02 21:48:57 +01:00
David Cernat
fc5e883160
[General] Rework PlayerStatsDynamic packets so they are of minimal size
2017-12-02 18:29:30 +02:00
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.
2017-12-02 15:39:08 +02:00
David Cernat
047ad40b96
[Client] Clear FortifyAttribute effects when server sets modifier to 0
2017-12-02 09:22:36 +02:00
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.
2017-12-02 09:19:33 +02:00
David Cernat
ef6dc61797
[Client] Send PlayerAttribute packets when attribute modifiers change
2017-11-30 23:03:34 +02:00
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
2017-11-30 22:37:06 +02:00
