14437 commits

Author	SHA1	Message	Date
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
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
Bret Curtis	ecfc5fcd63	Merge pull request #1764 from akortunov/lightfix ... Ignore lights without CanCarry flags when NPC selects torch	2018-06-17 08:40:50 +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
Bret Curtis	3f88aa46d0	Merge pull request #1759 from Thunderforge/refactor-launcher-sdl ... Refactor SDL loading in Launcher to fix macOS errors	2018-06-15 12:58:44 +02:00
Andrei Kortunov	9c3da41130	Add murder bounty when a player follower commits murder (bug #2852)	2018-06-15 14:31:09 +04:00
Thunderforge	506d615acc	Moving csignal import from main to graphicspage	2018-06-14 22:16:35 -05:00
Thunderforge	7615e78e52	Move SDL initialization from main.cpp to graphicspage.cpp	2018-06-14 19:39:24 -05:00
Capostrophic	1abf749f03	Remove screenshot taken message	2018-06-14 22:08:53 +03: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
Marc Zinnschlag	f62df90960	Merged pull request #1572	2018-06-13 18:11:31 +02:00
Andrei Kortunov	61c968d550	Ignore broken items when search for replacement (bug #4453)	2018-06-13 18:39:02 +04:00
Marc Zinnschlag	7ca56ccd29	set search status bar to 'no results' message when search yields no results	2018-06-13 15:48:24 +02:00
Andrei Kortunov	81b78a82e8	AI: try to open doors every AI_REACTION_TIME seconds (bug #4454)	2018-06-13 17:47:32 +04:00
Marc Zinnschlag	7d2394273e	added statusbar to search window (Fixes #3276)	2018-06-13 14:55:03 +02:00
Miloslav Číž	dcfbd554bb	Remove try catch block	2018-06-13 11:12:46 +02:00
Bret Curtis	3e4dc31e39	Merge branch 'master' into fatigue	2018-06-13 10:04:32 +02:00
Marc Zinnschlag	1ba0317905	Merged pull request #1670	2018-06-13 09:02:31 +02:00
Marc Zinnschlag	48711bbdde	Merged pull request #1592	2018-06-13 08:58:06 +02:00
Miloslav Číž	c3d7ee5a9e	Resolve merge conflicts	2018-06-13 08:22:37 +02:00
Miloslav Číž	db8aaa74d6	Start cell border debug drawing	2018-06-13 01:48:31 +02:00
Andrei Kortunov	9c45cc7e48	Use player reference instead of pointer	2018-06-12 22:05:00 +04:00
Marc Zinnschlag	a3911f52a0	Merged pull request #1750	2018-06-12 19:15:14 +02:00
Marc Zinnschlag	97773697a9	Merge remote-tracking branch 'florianjw/precise-rotations'	2018-06-12 19:05:52 +02:00
Capostrophic	1c8a20a54a	Set ok button focus in settings window by default (fixes #4368)	2018-06-12 19:45:43 +03:00
Andrei Kortunov	f299be8158	Play scripted animations even if SkipAnim is used	2018-06-12 16:07:36 +04:00
Andrei Kortunov	25bb7c1826	Make 'PlayGroup idle' to cancel scripted animations	2018-06-12 14:04:03 +04:00
Andrei Kortunov	0e441d48ac	Give scripted animations highest priority (bug #4286)	2018-06-12 12:55:28 +04:00
Andrei Kortunov	0c92655250	Avoid code duplication in character manager	2018-06-12 11:51:54 +04:00
Andrei Kortunov	e3812f4075	Check creature stats only for actors	2018-06-12 11:27:18 +04:00
Andrei Kortunov	b0a140e714	Disable actor collision only after end of death animation	2018-06-12 10:00:38 +04:00
Andrei Kortunov	ebaa6fb5a2	Play death scream only once	2018-06-12 09:55:43 +04:00
Andrei Kortunov	427be928d0	Do not update animation state for dead actors	2018-06-11 23:17:54 +04:00
Andrei Kortunov	977a27ecb7	Do not clear corpses until end of death animation (bug #4307)	2018-06-11 22:29:32 +04:00
Bret Curtis	7310e3c8c2	Merge pull request #1748 from akortunov/bookfix ... Do not show any book text after last <BR> tag	2018-06-11 17:08:26 +02:00
Andrei Kortunov	a42c663fd7	Do not interrupt scripted animations by death animation (bug #4286)	2018-06-11 18:53:25 +04:00