10712 commits

Author	SHA1	Message	Date
Bret Curtis	f07d50e5bf	Merge pull request #1785 from akortunov/warnfix ... Fix some GCC warnings	2018-06-28 10:33:51 +02:00
Andrei Kortunov	5455490ad2	Avoid fall-through in spell selection	2018-06-28 11:12:48 +04:00
Nikolay Kasyanov	5fcb091127	Replace FIXME with a detailed explanation of the issue	2018-06-27 22:40:09 +02:00
Nikolay Kasyanov	9c78364c45	Revert "Merge pull request #1771 from Xenkhan/master" ... This reverts commit 9667dd051c, reversing changes made to f52e06fc19.	2018-06-27 22:19:09 +02:00
Andrei Kortunov	3c7ab976c3	Ignore movement from scripted animations (bug #4475)	2018-06-27 08:22:45 +04:00
Marc Zinnschlag	705b2dca0e	Merged pull request #1777	2018-06-25 11:58:12 +02:00
Marc Zinnschlag	baeaff2309	Merged pull request #1778	2018-06-25 11:57:45 +02:00
Andrei Kortunov	97d8cc0efe	Check if the local was not found, just for sure	2018-06-25 11:21:00 +04:00
Andrei Kortunov	7dff8d8fe2	Check cell for null	2018-06-25 10:26:58 +04:00
Andrei Kortunov	441463327c	Validate map size	2018-06-25 09:57:40 +04:00
Andrei Kortunov	359e748c28	Initialize some missing fields in constructors	2018-06-25 09:35:42 +04:00
Capostrophic	ecafcefae9	Fall back to regular head when getVampireHead fails	2018-06-24 14:39:48 +03:00
Capostrophic	35b0546737	Consider <p> tag when discarding post-EOL tag text (regression #4473)	2018-06-23 14:27:40 +03:00
Bret Curtis	a55583a395	Merge branch 'master' into master	2018-06-21 22:22:01 +02:00
Xenkhan	405a0caf29	Remove unneeded whitespace	2018-06-20 13:56:00 -05:00
Xenkhan	5a4817c147	Get rid of reinterpret_cast<>	2018-06-20 13:33:59 -05:00
Marc Zinnschlag	22eb037c18	Merged pull request #1773	2018-06-20 19:08:50 +02:00
Bret Curtis	6655b7e512	Merge pull request #1740 from nikolaykasyanov/software-cursor-decompression ... Decompress cursors using SDL software renderer on Mac or if OSG >= 3.5.8 or if OPENMW_DECOMPRESS_TEXTURES is set	2018-06-20 17:19:48 +02:00
Bret Curtis	b619c0de2d	Merge pull request #1772 from akortunov/deathanim ... Fast-forward death animation to end if death animation was finished earlier	2018-06-20 13:28:36 +02:00
Andrei Kortunov	c195144b17	Take transformation from first node with given name in file (bug #4469)	2018-06-20 14:24:32 +04:00
Bret Curtis	664edc5a39	Merge pull request #1757 from akortunov/musicfix ... Handle exception when try to load non-music file	2018-06-20 11:18:50 +02:00
Andrei Kortunov	c9756cee4c	Fast-forward death animation to end if death animation was finished earlier (regression #4468)	2018-06-20 12:37:58 +04:00
Xenkhan	24ddb66af9	Retrieve SDL window settings instead of using magic numbers	2018-06-19 15:03:30 -05:00
Capostrophic	6c23caadd7	Fix crash when a target in a different cell is (un)locked	2018-06-19 20:43:18 +03:00
Capostrophic	0c4fa55f16	Make Open spells casted by anything trigger player crime event (fixes #4461)	2018-06-19 17:04:38 +03:00
Marc Zinnschlag	7cfb7063c2	Merged pull request #1767	2018-06-19 13:30:10 +02:00
Marc Zinnschlag	7be069fcd2	Merged pull request #1743	2018-06-19 13:29:20 +02:00
Andrei Kortunov	5fd3ec1035	Implement unlockable locks with 'lock 0' console command	2018-06-19 14:17:33 +04:00
Marc Zinnschlag	a8ad530db9	Merged pull request #1749	2018-06-19 11:33:08 +02:00
Marc Zinnschlag	2a52ade219	Merged pull request #1760	2018-06-19 11:26:41 +02:00
Capostrophic	8376c8c68e	Allow partial matches in NotCell condition (fixes #4459)	2018-06-18 03:27:31 +03:00
Bret Curtis	e93104a6b3	Merge pull request #1758 from Capostrophic/screenshot ... Remove screenshot taken message again	2018-06-17 22:26:00 +02:00
Bret Curtis	70dec71c00	Merge pull request #1763 from akortunov/activatedoor ... Forbid actors to use teleporting doors	2018-06-17 10:13:16 +02:00
Bret Curtis	3cc6da1db2	Update door.cpp ... typo fix	2018-06-17 10:13:03 +02:00
Bret Curtis	3f2dbdc8a8	Merge branch 'master' into wanderfix	2018-06-17 10:00:38 +02:00
Andrei Kortunov	f3f7487664	Fix arguments parsing for AiWander console command (bug #4458)	2018-06-16 22:11:10 +04:00
Andrei Kortunov	e08b0d3070	Ignore lights without CanCarry flags when NPC selects torch (bug #4457)	2018-06-16 17:34:49 +04:00
Andrei Kortunov	2a65aaf5ab	Forbid actors to use teleporting doors (bug #2562)	2018-06-16 14:21:28 +04:00
Nikolay Kasyanov	359f87ab9f	Change imageToSurface to return a unique_ptr to avoid manual surface cleanup	2018-06-16 12:12:32 +02:00
Andrei Kortunov	9c3da41130	Add murder bounty when a player follower commits murder (bug #2852)	2018-06-15 14:31:09 +04:00
Capostrophic	1abf749f03	Remove screenshot taken message	2018-06-14 22:08:53 +03:00
Andrei Kortunov	2854f6ca83	Handle exception if we try to play non-music file (bug #4416)	2018-06-14 21:32:40 +04:00
Miloslav Číž	477e1437d2	Resolve conflicts	2018-06-14 15:30:28 +02:00
Andrei Kortunov	49ba00a3ec	Add NPC validation to esmstore (bug #2772)	2018-06-14 16:48:16 +04:00
Miloslav Číž	dd00e438fe	Merge branch 'screenshot360' of https://github.com/drummyfish/openmw into screenshot360	2018-06-13 21:35:03 +02:00
Miloslav Číž	7178ee3a6e	Add FIXME comment	2018-06-13 21:34:43 +02:00
Miloslav Číž	d629c30fdb	Merge branch 'master' into screenshot360	2018-06-13 21:16:28 +02:00
Marc Zinnschlag	2b35c5efd7	Merge remote-tracking branch 'upstream/master'	2018-06-13 18:13:15 +02:00
Marc Zinnschlag	aea481eacb	Merged pull request #1753	2018-06-13 18:12:38 +02:00
Andrei Kortunov	61c968d550	Ignore broken items when search for replacement (bug #4453)	2018-06-13 18:39:02 +04:00