20559 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Chris Robinson	08e947319a	Restore exception throwing to the decoder	2017-12-09 11:00:56 -08:00
Chris Robinson	06ae61479a	If a sound effect fails to load, substitute silence.	2017-12-08 22:10:09 -08: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
Chris Robinson	aecf74e7bb	Don't throw exceptions from the audio decoder	2017-12-08 07:00:04 -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
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	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	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
David Cernat	c9c363ebef	[General] Allow GameSettings to set bed & wilderness resting separately	2017-11-30 12:18:15 +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
scrawl	bb7ca055d0	Update AUTHORS.md	2017-11-29 22:13:42 +00:00
scrawl	47a5229eed	Merge pull request #1564	2017-11-29 22:10:36 +00:00
scrawl	59bfd670c0	Merge pull request #1571	2017-11-29 22:04:41 +00:00
David Cernat	22521578eb	Merge pull request #349 from OpenMW/master ... Add OpenMW commits up to 28 Nov 2017	2017-11-29 03:52:15 +02:00
Grigorii Latyshev	2abb1a2ec2	Added checkMagicka parameter	2017-11-28 23:35:54 +01:00
Grigorii Latyshev	9fe5a4d236	Revert condition changes	2017-11-28 23:35:46 +01:00
Grigorii Latyshev	dab72b45db	Move mana reducing code back	2017-11-28 23:34:05 +01:00
scrawl	3984dc8f16	Merge pull request #1570	2017-11-28 21:39:04 +00:00
Andrei Kortunov	b9d9660efd	Update music state in the menu mode (bug #3664)	2017-11-28 20:49:48 +04:00
Andrei Kortunov	f7f8dfaf2a	AiWander: do not allow flying/swimming creatures to use pathgrid	2017-11-28 18:03:13 +04:00
scrawl	9920779a7b	Merge pull request #1543	2017-11-27 21:21:54 +00:00
scrawl	c50b18b3bb	Move PathgridGraph out of CellStore ... By definition this is not 'Mutable state of a cell' and does not belong in CellStore. This change should improve startup times (graph is now loaded on demand) and edits to 'pathgrid.hpp' no longer cause the entirety of OpenMW to be rebuilt.	2017-11-27 21:20:31 +00:00
scrawl	5fe68ab062	Merge pull request #1419	2017-11-27 21:13:11 +00:00