15276 commits

Author	SHA1	Message	Date
David Cernat	01db219de4	Merge pull request #333 from OpenMW/master ... Add OpenMW commits up to 11 Nov 2017	2017-11-11 03:46:21 +02:00
scrawl	f1aeb416ec	Disable Activate key when textinput is active (Bug #4151)	2017-11-10 22:54:53 +00:00
scrawl	b06512a60d	Fix error message that referred to the wrong file (Bug #4159)	2017-11-10 22:51:32 +00:00
scrawl	1afbf99f74	Make movement keys not function in text input mode	2017-11-10 22:51:31 +00:00
David Cernat	f2a6957e16	Merge pull request #331 from OpenMW/master while resolving conflicts	2017-11-10 08:43:50 +02:00
scrawl	9ecdcc187f	Clarify a warning message refers to inventory objects	2017-11-08 00:26:09 +00:00
scrawl	95b3c1181a	Update shader with a non-color tracking material when equipment is changed during chameleon/invisibility effects (Fixes #4190)	2017-11-08 00:24:52 +00:00
scrawl	e42bd71081	Add missing WaitDialog::clear() (Fixes #4196)	2017-11-08 00:24:04 +00:00
scrawl	801f2d42d5	Merge pull request #1537 from drummyfish/guardfix ... Check the real distance to target in AIPursue (issue #4184)	2017-11-05 23:24:59 +00:00
Miloslav Číž	f98a821482	fix possible bug in aipursue	2017-11-05 23:46:15 +01:00
scrawl	87c79d7102	Merge pull request #1536 from rexelion/knockoutfix ... Wait a few seconds before getting up (fixes #3884)	2017-11-05 20:27:54 +00:00
scrawl	45993d3da2	Merge pull request #1529 from drummyfish/animfix ... Stop character landing animation when turning (issue #4177)	2017-11-05 20:24:24 +00:00
Miloslav Číž	430d01a39a	additional animation refactor	2017-11-05 20:19:47 +01:00
rexelion	de7a7d842b	mTimeUntilWake is initialised in the constructor	2017-11-05 18:30:34 +00:00
scrawl	e6303c578c	Merge pull request #1530 from rexelion/curseitemfix ... Trigger OnActivate when item is picked up through the inventory (Issue #3726)	2017-11-05 15:35:39 +00:00
rexelion	48ec680f23	use game time instead of real time	2017-11-04 19:37:20 +00:00
Miloslav Číž	f34223fce9	check the real distance to target in aipursue	2017-11-04 20:02:21 +01:00
rexelion	ab66034ed1	use uniform_int_distribution instead of rand()	2017-11-04 02:15:56 +00:00
rexelion	ee2f3db9a8	fixed randomness	2017-11-04 01:31:15 +00:00
rexelion	8c2cc0f42f	break invisibility first	2017-11-04 00:44:16 +00:00
rexelion	bcbfa5fe1e	prevent activation, leave the rest to the script	2017-11-04 00:38:33 +00:00
rexelion	de83ad0116	use real time; wait random number of seconds	2017-11-04 00:24:09 +00:00
rexelion	5b8610b34b	knocked out characters wait some time before getting up	2017-11-01 23:44:50 +00:00
rexelion	a9e5e19482	OnActivate is triggered when the item is picked up	2017-10-31 22:33:26 +00:00
Miloslav Číž	ff1265c0e7	refactor jump animation	2017-10-31 14:22:24 +01:00
David Cernat	a31d43965f	Merge pull request #328 from OpenMW/master ... Add OpenMW commits up to 31 Oct 2017	2017-10-31 06:22:57 +02:00
rexelion	e8743f3f79	check the presence of OnActivate using the SuppressActivate flag instead of looking for keywords	2017-10-30 21:16:25 +00:00
Miloslav Číž	3c65bdaf14	weapon cycle fix	2017-10-30 18:05:45 +01:00
Miloslav Číž	7bc512974f	use mcurrentjump instead of custom attrib	2017-10-30 15:26:38 +01:00
rexelion	4e6f53d6f1	item added to the player and OnActivate is triggered when the inventory is closed	2017-10-29 11:45:17 +00:00
rexelion	1ee5dcff77	added a function to determine if a script contains OnActivate	2017-10-28 20:56:08 +01:00
Miloslav Číž	5c8f491441	move animation disabling code to a better place	2017-10-28 18:46:52 +02:00
Miloslav Číž	f9c396e0ea	stop landing animation when turning	2017-10-28 15:48:07 +02:00
Miloslav Číž	03401bb5df	remove redundant condition	2017-10-27 20:19:20 +02:00
David Cernat	37304655da	Merge pull request #326 from OpenMW/master ... Add OpenMW commits up to 25 Oct 2017	2017-10-26 17:28:56 +03:00
scrawl	4a7be0ffda	Don't reset journal index to a lower value (Fixes #4172)	2017-10-24 20:02:35 +00:00
David Cernat	dd25c7db4e	Merge pull request #324 from OpenMW/master ... Add OpenMW commits up to 24 Oct 2017	2017-10-24 19:36:14 +03:00
David Cernat	a94d4ce6f5	Merge pull request #323 from TES3MP/0.6.1 ... Add hotfix commit for 0.6.1 from 23 Oct 2017	2017-10-24 19:34:34 +03:00
scrawl	4437a72e47	Merge pull request #1519 from drummyfish/rainfix ... fix rain ripple regression (bug #4169)	2017-10-24 15:31:16 +00:00
Miloslav Číž	3731e20228	fix rain ripple regression	2017-10-24 14:12:41 +02:00
scrawl	0c6ef17fb5	Add explicit variant of 'OnActivate'	2017-10-23 23:33:06 +00:00
scrawl	e564dd842e	Refactor dialogue responses to make sure messages from scripts are printer afterwards, not before the dialogue response (Fixes #4166) ... Don't delete Link objects prematurely (Fixes #4171)	2017-10-23 23:33:06 +00:00
scrawl	2a0b2c4e24	Hide modal window before deleting it (Fixes #4168)	2017-10-23 23:33:05 +00:00
David Cernat	3aedc2e5bc	[Server] Don't automatically share PlayerTopic packets between players	2017-10-23 19:39:35 +03:00
David Cernat	360cf2ead7	Merge pull request #321 from OpenMW/master ... Add OpenMW commits up to 22 Oct 2017	2017-10-23 14:51:29 +03:00
scrawl	8b19a8b7f6	Merge pull request #1513 from lukago/feature4082b ... Feature #4082: use many ingredients/potions instantly	2017-10-22 20:51:14 +00:00
scrawl	3d0094bd2e	Fix behavior of 'journal' command when invoked with already seen entry	2017-10-22 20:50:15 +00:00
scrawl	768da57da2	Fix dialogue topics displayed in lower case	2017-10-22 20:50:15 +00:00
David Cernat	3a9e5e3a7b	Merge pull request #319 from OpenMW/master while resolving conflicts ... # Conflicts: # apps/openmw/mwworld/worldimp.hpp	2017-10-22 20:27:44 +03:00
lukago	b6cb3b445c	use getIndex to handle other windows, nullsafe fixes	2017-10-21 23:34:57 +02:00