14465 Commits

Author	SHA1	Message	Date
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
Andrei Kortunov	d0619cfb35	Play death animation for non-persisting actors with 0 health (bug #4291)	2018-06-11 18:52:20 +04:00
Andrei Kortunov	6099735c60	Early out only when scripted animation is playing	2018-06-11 17:52:58 +04:00
Andrei Kortunov	e234dd2a36	Do not interrupt scripted animations	2018-06-11 17:18:51 +04:00
Andrei Kortunov	66a46ff03c	Do not show any book text after last <BR> tag.	2018-06-11 11:22:56 +04:00
Capostrophic	d43766d3c9	Make WakeUpPC interrupt waiting if it was supposed to be (fixes #3629)	2018-06-10 18:42:18 +03:00
Andrei Kortunov	acd3cba5fa	Store previous items in the savegame	2018-06-10 16:21:19 +04:00
Andrei Kortunov	9fd2d57b86	Move previous items to player	2018-06-10 16:21:19 +04:00
Andrei Kortunov	f977c6876f	Bound items: store item ID instead of pointer	2018-06-10 16:21:19 +04:00
Andrei Kortunov	4de9d9fa77	Split adjustBoundItem()	2018-06-10 16:21:19 +04:00
Andrei Kortunov	d1b1cb748d	Reequip previous item only if the expired bound item was equipped	2018-06-10 16:21:19 +04:00
Andrei Kortunov	9b72a6ac69	Use the MWWorld::Ptr() instead of string ID	2018-06-10 16:21:19 +04:00
Andrei Kortunov	0375bedab2	Equip previous item after a bound item expires (bug #2326)	2018-06-10 16:21:19 +04:00
Andrei Kortunov	ae87e0d3fc	Do not reset mUpperBodyState for weapon->weapon switch (regression #4446)	2018-06-09 15:34:08 +04:00
Andrei Kortunov	4ba361fea6	Unhardcode sunset and sunrise settings (bug #1990)	2018-06-09 13:09:17 +04:00
Marc Zinnschlag	7d9de93fd3	Merged pull request #1477	2018-06-09 10:52:35 +02:00
Marc Zinnschlag	551a69f1b1	Merged pull request #1559	2018-06-09 10:51:02 +02:00
Marc Zinnschlag	efb4abbb7f	Merged pull request #1623	2018-06-09 10:49:04 +02:00
Marc Zinnschlag	76972bb2f6	Merged pull request #1709	2018-06-09 10:46:02 +02:00
Thunderforge	dfa9968565	Renaming Launcher::DataFilesPage::signalSelectedFilesChanged to signalLoadedCellsChanged	2018-06-08 19:18:23 -05:00
Thunderforge	62c4eb8d6a	Explicitly flagging loaded cells changed as queued	2018-06-08 19:16:24 -05:00
Andrei Kortunov	6ed2773299	Do not stack return packages	2018-06-08 21:53:47 +04:00
Andrei Kortunov	74a2cbe696	AI: return back after pursuit	2018-06-08 21:53:47 +04:00