19363 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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	0d3f535590	Warn about mod conflicts	2018-06-12 08:57:24 +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
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	ae87e0d3fc	Do not reset mUpperBodyState for weapon->weapon switch (regression #4446)	2018-06-09 15:34:08 +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	619110ca4c	Merged pull request #1737	2018-06-09 10:47:54 +02:00
Marc Zinnschlag	76972bb2f6	Merged pull request #1709	2018-06-09 10:46:02 +02:00
Marc Zinnschlag	6a4cd975b6	Merge remote-tracking branch 'capostrophic/goodbye'	2018-06-09 10:44:14 +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	2e6cf2a414	Add changelog entries	2018-06-08 21:54:24 +04: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
Andrei Kortunov	3d0631cfcc	Store last AI package in savegame	2018-06-08 21:53:47 +04:00
Andrei Kortunov	3a0ee78d2b	AiTravel: store mHidden flag in savegame	2018-06-08 21:53:47 +04:00
Andrei Kortunov	2f5beb8853	Remove unnecessary hack	2018-06-08 21:53:47 +04:00
Andrei Kortunov	57d686131e	Remove redundant condition	2018-06-08 21:53:47 +04:00
Andrei Kortunov	5105c67642	Add mHidden field to AiTravel	2018-06-08 21:53:47 +04:00
Andrei Kortunov	81f29d8dcd	AiWander: resume moving to destination after combat	2018-06-08 21:53:47 +04:00
Andrei Kortunov	18ff097e4a	Add the parameter to AiSequence::stack() to control ability to cancel other AI packages	2018-06-08 21:53:47 +04:00
Andrei Kortunov	9d27eb197f	AiWander: return to initial position only after combat	2018-06-08 21:53:47 +04:00
Bret Curtis	3c2c0960d1	Merge pull request #1734 from MocquillonCedric/windows-cmake-pre3.9-support ... Add support for msvc with cmake version pre 3.9 (fixes #4429)	2018-06-08 19:14:01 +02:00
Bret Curtis	61c969e970	Merge branch 'master' into hitboxfix	2018-06-08 18:36:44 +02:00
Capostrophic	b274931165	Revert erroneous changes	2018-06-08 19:18:53 +03:00
Capostrophic	dd2a11b243	Merge branch 'master' into goodbye	2018-06-08 19:16:36 +03:00
Capostrophic	99781ab70c	Fix changelog	2018-06-08 19:15:31 +03:00
Andrei Kortunov	fed10e87aa	Store integer actor ID in AI packages (bug #4036)	2018-06-08 19:57:41 +04:00
Marc Zinnschlag	9d0ce25052	Merged pull request #1738	2018-06-08 17:28:08 +02:00
Cédric	de5a3eaae9	Fix indentation issue: replace tab by spaces	2018-06-08 17:08:44 +02:00
Marc Zinnschlag	7899f44173	Merged pull request #1619	2018-06-08 17:07:38 +02:00
Bret Curtis	6c04cecab1	Merge pull request #1704 from akortunov/per_group_animation ... [Feedback needed] Support for per-group KF-animation files	2018-06-08 15:06:43 +02:00
Andrei Kortunov	fea34bd73f	Added support for per-group animation files	2018-06-08 17:04:15 +04:00
Capostrophic	0db702dfa7	Update changelog	2018-06-08 15:05:00 +03:00
Capostrophic	11103211c5	Make Goodbye and Choice choices mutually exclusive	2018-06-08 15:03:19 +03:00
Andrei Kortunov	2fada94879	Improve MRK NiStringExtraData handling (bug #4419)	2018-06-08 15:44:35 +04:00
Marc Zinnschlag	53e8882366	updated changelog	2018-06-08 11:44:49 +02:00
Marc Zinnschlag	21ea49fe83	Merge remote-tracking branch 'capostrophic/physics'	2018-06-08 11:43:10 +02:00
Cédric	b784c7873d	Update authors	2018-06-08 06:36:43 +02:00
Cédric	4a9b790dbe	Update changelog	2018-06-08 06:36:11 +02:00