19360 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Marc Zinnschlag	93716cecd9	Merge remote-tracking branch 'origin/master'	2017-12-19 17:01:03 +01:00
scrawl	993982628d	Merge pull request #1590	2017-12-18 20:41:12 +00:00
Andrei Kortunov	1a58171e86	Do not allow to sell items from containers with zero capacity (bug #4268)	2017-12-17 18:09:25 +04:00
Bret Curtis	1c25b7ca57	Merge pull request #1589 from Thunderforge/build/setting-cmake-cxx-standard ... Explicitly setting CMAKE_CXX_STANDARD to C++11	2017-12-17 09:29:39 +01:00
Thunderforge	e4a1b6b5b8	Explicitly setting CMAKE_CXX_STANDARD to C++11	2017-12-16 14:36:27 -06:00
Miloslav Číž	01f9d90315	CS: Reorder 3D input menu	2017-12-15 17:22:32 +01:00
Miloslav Číž	13dc1bd41e	CS: Add tooltip to camera-ortho-size preference	2017-12-15 14:56:03 +01:00
Miloslav Číž	1f5feeddb9	CS: Change camera parameter types to int	2017-12-15 14:46:23 +01:00
Miloslav Číž	f2777f7242	CS: Mover object-marker-alpha under Rendering	2017-12-15 14:36:12 +01:00
Marc Zinnschlag	ecf1cea1b7	Merge remote-tracking branch 'drummyfish/cs-cam'	2017-12-15 13:41:54 +01:00
Miloslav Číž	79527b746a	Remove unused variable	2017-12-14 17:29:24 +01:00
Miloslav Číž	b246580c63	Fix orbit camera axis	2017-12-13 20:08:38 +01:00
scrawl	ccd8ca2e69	Merge pull request #1586	2017-12-13 10:58:34 +00:00
scrawl	b6ac1c5697	Merge pull request #1587	2017-12-13 10:58:25 +00:00
scrawl	269c3227ea	Make sure we have cmake for the before_install step	2017-12-13 10:44:32 +00:00
Andrei Kortunov	ba46473038	Do not skip weather transitions from SetPos script command (bug #3603)	2017-12-13 10:53:23 +04:00
scrawl	e9ecaf712b	Merge pull request #1584	2017-12-12 20:11:05 +00:00
scrawl	7d62f05f81	Merge pull request #1583	2017-12-12 20:10:59 +00:00
scrawl	70661a4b1c	Merge pull request #1585	2017-12-12 20:10:45 +00:00
Andrei Kortunov	0e04a26ef6	Set duration of magic effects from ingredients (bug #4261)	2017-12-10 16:10:44 +04:00
Andrei Kortunov	c908ad2fba	Do not allow to place actors underground via SetPos (bug #3783)	2017-12-10 14:38:02 +04:00
Chris Robinson	08e947319a	Restore exception throwing to the decoder	2017-12-09 11:00:56 -08:00
Miloslav Číž	ee40b41285	Add slider for refraction size in settings window	2017-12-09 14:03:56 +01:00
Miloslav Číž	d13fc06baf	Add basic refraction scale documentation	2017-12-09 12:52:28 +01: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
Miloslav Číž	b69c16e682	Add setting option to scale water refractions	2017-12-06 20:39:09 +01: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
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