10475 commits

Author	SHA1	Message	Date
Andrei Kortunov	4f190bf7f4	Do not show carriage return characters (bug #3696)	2017-11-23 14:58:20 +04:00
Andrei Kortunov	4d384889af	Fix the Topics button position if the Tribunal is not installed	2017-11-23 10:14:45 +04:00
Miloslav Číž	de42aa9d03	Make thrown projectiles rotate	2017-11-23 00:32:22 +01:00
AnyOldName3	4612597877	Switch to insert_or_assign semantics when adding shadow defines to the global shader defines.	2017-11-22 20:54:39 +00:00
AnyOldName3	98cd9fc144	Add preliminary support for global shader defines.	2017-11-22 20:07:07 +00:00
Andrei Kortunov	86a17b1e3e	Get rid of the redundant Utf8Stream when during journal index creation	2017-11-22 09:06:54 +04:00
Andrei Kortunov	3571f7f413	Remove getEncoding() from WindowManager	2017-11-22 08:32:38 +04:00
Andrei Kortunov	5f41f7c48d	Clean code up a bit	2017-11-21 13:03:38 +04:00
Andrei Kortunov	ba91cd658b	Convert topic name to Unicode	2017-11-21 12:31:23 +04:00
Andrei Kortunov	f0ca3eabd3	Merge from upstream master	2017-11-21 09:39:54 +04:00
Andrei Kortunov	a83a43e376	Determine when need to use the Cyrillic journal index	2017-11-21 09:32:35 +04:00
scrawl	719255c5c6	Merge pull request #1557 from akortunov/journalfix ... [Feedback needed] Handle 128px Tx_menubook_topics textures	2017-11-20 23:07:18 +00:00
Andrei Kortunov	ce5bdd6361	Split the JournalBooks::createTopicIndexBook()	2017-11-20 22:25:53 +04:00
Andrei Kortunov	a391990f2a	Provide multibyte toLower() and single chars comparator	2017-11-20 21:30:46 +04:00
Andrei Kortunov	4dcaf040e6	A Russian journal index	2017-11-20 19:37:24 +04:00
Andrei Kortunov	60d0c83cca	Handle 128px Tx_menubook_topics textures	2017-11-20 17:39:28 +04:00
Miloslav Číž	ea2bbce68a	Fix memory leak in WindowManager	2017-11-18 19:27:09 +01:00
AnyOldName3	0f6f097cf2	Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm	2017-11-17 18:24:08 +00:00
scrawl	36f4f0ef85	Don't increase simulationTime while the game is minimized (Fixes #4211)	2017-11-16 18:48:49 +00:00
scrawl	cf40d19d7d	Merge pull request #1551 from thegriglat/abs ... Change abs to std::abs	2017-11-15 17:34:59 +00:00
scrawl	60fba7acd8	Fix reorder warning	2017-11-15 17:20:08 +00:00
scrawl	c36d250044	Parse dialogue text for keywords after the resultscript runs (Fixes #4210)	2017-11-15 17:20:06 +00:00
scrawl	7c5d2a1ac4	Update dialogue topics list after result script is run ... Regression from 0.42.	2017-11-15 17:20:06 +00:00
Grigorii Latyshev	6e4f6c4bd5	Change abs to std::abs	2017-11-13 21:36:55 +01:00
scrawl	a7fd27f413	Merge pull request #1544 from rexelion/archerrangefix ... use fProjectileMaxSpeed for ranged weapons distance (fixes #4192)	2017-11-11 22:30:59 +00:00
scrawl	98b4f9c596	Merge pull request #1549 from akortunov/itemmodels ... Item models reworking	2017-11-11 22:12:07 +00:00
Andrei Kortunov	8c0dcd8b2b	Do not track a nearest actor during combat and pursue (bug #4179)	2017-11-11 19:46:59 +04:00
rexelion	f0649849b8	changed variable name to be more descriptive	2017-11-11 12:00:23 +00:00
Andrei Kortunov	9943bd4d74	AiWander fast forwarding improvements (bug #3638)	2017-11-11 15:31:06 +04:00
Andrei Kortunov	03f129b53c	remove redundant allowedToInsertItems() function from ItemModel	2017-11-11 11:58:22 +04:00
Andrei Kortunov	99517d83ea	Bound items detection refactoring	2017-11-11 11:58:22 +04:00
Andrei Kortunov	a02124f884	Handle item owners during pickpocketing	2017-11-11 11:58:18 +04: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
rexelion	69a56eaea3	don't initialise rangeAttackOfTarget	2017-11-10 10:44:53 +00:00
Andrei Kortunov	3694b6ec90	Move onClose() check to item models	2017-11-10 10:58:43 +04:00
Andrei Kortunov	ac33ff9482	Move onDropItem() check to item models	2017-11-10 10:58:43 +04:00
Andrei Kortunov	3604b73d60	Move onTakeItem() to item models	2017-11-10 10:58:40 +04:00
rexelion	983c33c4c8	don't use a pointer for ActionWeapon	2017-11-09 14:23:26 +00:00
AnyOldName3	548c42b5fd	Disable over-zealous shadows in the character preview.	2017-11-08 13:38:30 +00:00
AnyOldName3	64d5d0fd66	Prevent the local map from being considered to be shadowed.	2017-11-08 13:30:13 +00:00
AnyOldName3	e201e359a9	Move Shadow to Components	2017-11-08 01:44:49 +00:00
AnyOldName3	1a30a917af	Merge upstream/master	2017-11-08 01:31:38 +00:00
AnyOldName3	2e7951c83f	Remove unused mask	2017-11-08 01:28:10 +00:00
AnyOldName3	aa31cbba4f	Attempt (and fail) to make the local map show without unwanted shadow	2017-11-08 01:20:52 +00:00
AnyOldName3	c3616ca78b	Merge branch 'osgshadow-test-vdsm-sky-method-two' into osgshadow-test-vdsm	2017-11-08 00:35:54 +00: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
AnyOldName3	25432146f7	Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm	2017-11-07 22:08:21 +00:00
AnyOldName3	3403205231	Use three shadow maps per light	2017-11-07 20:34:48 +00:00
rexelion	cab0002461	Backing up distance is now dependent on opponents's weapon range; don't back up from ranged oponents	2017-11-07 17:57:23 +00:00
AnyOldName3	3106159721	Turn off all shadow texture units for the sky now it is possible for there to be more than one	2017-11-07 16:40:32 +00:00
AnyOldName3	09b02c307a	Merge from base branch	2017-11-07 16:34:51 +00:00
rexelion	a1d9f11b04	use fProjectileMaxSpeed for ranged weapons distance	2017-11-07 11:43:21 +00:00
AnyOldName3	56fa33af66	Enable parallel split shadow maps	2017-11-07 00:32: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
AnyOldName3	7a03ad6558	Switch to a tidier way of disabling the correct texture unit	2017-11-05 14:46:03 +00:00
AnyOldName3	26fe47b9a2	Merge branch 'osgshadow-test-vdsm' into osgshadow-test-vdsm-sky-method-two	2017-11-05 14:39:41 +00:00
AnyOldName3	3f63ebce77	Theoretically, at least, fix everything (except hte sky issue which is resolved in another branch)	2017-11-05 14:37:36 +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
AnyOldName3	d0587a3ad5	Clean up the debug hud now it's working.	2017-11-03 14:33:06 +00:00
AnyOldName3	b0c0c88201	Merge branch 'osgshadow-test-vdsm' into osgshadow-test-vdsm-sky-method-two	2017-11-03 00:44:47 +00:00
rexelion	5b8610b34b	knocked out characters wait some time before getting up	2017-11-01 23:44:50 +00:00
AnyOldName3	ce0e937e8d	Attempt to force the sky to not accept the default shadow shader or shadow texture.	2017-11-01 18:22:59 +00:00
rexelion	a9e5e19482	OnActivate is triggered when the item is picked up	2017-10-31 22:33:26 +00:00
scrawl	ceaf0ee409	Enable shadow casting for terrain ... Add a check to TerrainDrawable to make sure shadows are only drawn once, not once per blending pass	2017-10-31 21:21:05 +01:00
scrawl	8141ee47d5	Fix shader compile error	2017-10-31 20:22:14 +01:00
scrawl	d0866d1b3c	Revert change to node mask that appears to not serve any purpose	2017-10-31 20:21:54 +01:00
Miloslav Číž	ff1265c0e7	refactor jump animation	2017-10-31 14:22:24 +01:00
AnyOldName3	1d4b8656d1	Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm	2017-10-30 22:40:40 +00: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
AnyOldName3	ab669a434e	Update the shadow frustrum bounds properly	2017-10-30 19:54:54 +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
AnyOldName3	ef8a7d1cb9	Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm	2017-10-26 23:40:05 +01:00
AnyOldName3	cf54b4a130	Prevent debug HUD geometry from being culled erroneously.	2017-10-26 20:38:36 +01:00
scrawl	4a7be0ffda	Don't reset journal index to a lower value (Fixes #4172)	2017-10-24 20:02:35 +00: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
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
lukago	b6cb3b445c	use getIndex to handle other windows, nullsafe fixes	2017-10-21 23:34:57 +02:00
AnyOldName3	1c6e23f660	Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm	2017-10-21 18:36:37 +01:00
scrawl	bb4ffb7743	Merge pull request #1514 from akortunov/ringfix ... Do not replace an equpped ring of the same value	2017-10-21 13:35:55 +00:00
scrawl	075a7fee20	Merge pull request #1515 from akortunov/guifixes ... Fix a 'Good Beast' companion window	2017-10-21 13:35:29 +00:00
scrawl	5b2fe01375	Merge pull request #1508 from AnyOldName3/shut-up-travis ... Mark worldimp functions as override to stop distracting Travis CI war…	2017-10-21 13:34:48 +00:00
Andrei Kortunov	eaff7e30aa	Fix a 'Good Beast' companion window	2017-10-21 16:56:21 +04:00
Andrei Kortunov	e64f14b7ce	Do not replace an equpped ring of the same value	2017-10-20 23:05:12 +04:00
AnyOldName3	e24b76fb5e	Merge branch 'master' into osgshadow-test-vdsm	2017-10-20 18:18:38 +01:00
lukago	a3225364ff	refactor, use dragItem method	2017-10-19 17:43:27 +02:00
AnyOldName3	03fc3353b9	Tidy up indentation 2	2017-10-19 16:34:50 +01:00
AnyOldName3	f3e6b26e6b	Tidy up indentation	2017-10-19 16:34:11 +01:00
lukago	43f94a8890	simplify drag and drop on avatar for potions and ingredients	2017-10-19 16:50:04 +02:00
AnyOldName3	2a90dff388	Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm	2017-10-19 15:06:49 +01:00
Rhiyo	d9fe3aac99	fixed new clothing replacing old clothing of same value ... Found on the bug http://bugs.openmw.org/issues/4165. In original Morrowind, new clothing of the same value wouldn't replace old clothing. Tested with common and expensive clothing by selling to merchants and using the AddItem console command in original Morrowind. In OpenMW, before this change, new clothing of the same value would replace old clothing, tested with the same methods used above.	2017-10-19 22:46:08 +10:30
AnyOldName3	2abff22c08	Make MWWorld::World final to enable compiler optimisations	2017-10-18 13:48:31 +01:00
AnyOldName3	7440cf37bc	Remove redundant virtual keywords implied by override keywords	2017-10-18 13:37:37 +01:00
AnyOldName3	69da89be39	Mark a method I missed out the first time as override	2017-10-18 13:05:04 +01:00
scrawl	33ceddc58b	Merge pull request #1506 from akortunov/swimanimations ... Use SwimTurnLeft/Right animations correctly	2017-10-18 10:03:30 +00:00
scrawl	21a705fb75	Merge pull request #1507 from AnyOldName3/data-local-fix ... Fix the loading of 'data-local' lines which I broke	2017-10-18 09:59:43 +00:00
scrawl	7328de6c50	Merge pull request #1505 from drummyfish/master ... Make snow create water ripples (fixes #4156)	2017-10-18 09:59:21 +00:00
AnyOldName3	2aad5bed7a	Mark worldimp functions as override to stop distracting Travis CI warnings and prevent future typos	2017-10-18 05:06:09 +01:00
AnyOldName3	1f77f9654b	Strip quotes from the data-local setting if present (because for whatever reason it's a string, not a boost::filesystem::path)	2017-10-18 01:42:11 +01:00
Andrei Kortunov	4d4d247565	Use SwimTurnLeft/Right animations correctly	2017-10-17 23:26:55 +04:00
Miloslav Číž	a7cad65aab	fix water shader switching bug	2017-10-17 10:00:01 +02:00
Miloslav Číž	8a1e0e74fd	update uniform from one place	2017-10-17 09:59:53 +02:00
Miloslav Číž	797e407269	make snow create water ripples	2017-10-17 09:59:53 +02:00
Miloslav Číž	da47653625	move rain intensity uniform to water node	2017-10-17 09:59:45 +02:00
scrawl	03554b2f4b	Fix some style issues flagged by cppcheck	2017-10-15 17:06:58 +02:00
scrawl	64d02f577e	Fix missing null check	2017-10-15 17:06:58 +02:00
scrawl	624046c558	Fix unused event handler	2017-10-15 17:06:58 +02:00
scrawl	bbf9b0c0a7	Merge pull request #1503 from akortunov/regressions ... Handle Trespassing crime differently from Theft	2017-10-15 09:08:52 +00:00
scrawl	97ec38affb	Merge pull request #1492 from drummyfish/master ... fix rain/snow moving with player (issue #2698)	2017-10-15 09:04:48 +00:00
Andrei Kortunov	8f255a6b72	Handle Trespassing crime differently from Theft (bug #4158)	2017-10-15 11:03:02 +04:00
Miloslav Číž	af6eeddbe5	use operator instead of drawcallback	2017-10-15 00:04:14 +02:00
Miloslav Číž	65977b910e	wrap weather around in all directions	2017-10-14 21:42:27 +02:00
Miloslav Číž	380a5799dd	use bbox as wrap range & apply to all particle systems	2017-10-14 21:42:19 +02:00
Miloslav Číž	38bfa64100	transform weather particles to world space	2017-10-14 21:42:11 +02:00
Miloslav Číž	8114126a62	make use of renderinfo	2017-10-14 21:41:59 +02:00
Miloslav Číž	33a1459b11	search for particle system by class name	2017-10-14 21:41:47 +02:00
Miloslav Číž	b95c9ba483	rain independent from camera plus wrap-around	2017-10-14 21:40:28 +02:00
scrawl	548af6dbfb	Fix jail screen fading	2017-10-14 14:03:16 +00:00
scrawl	f3ca9832b0	Merge pull request #1500 from akortunov/extraspell ... Implement ExtraSpell magic effect	2017-10-14 14:01:49 +00:00
Andrei Kortunov	30b05b557b	ExtraSpell magic effect: a basic implementation	2017-10-14 16:55:00 +04:00
AnyOldName3	737563875a	Remove superfluous - sign and switch to other debug shader	2017-10-14 01:13:45 +01:00
AnyOldName3	147455626e	Merge OpenMW/master	2017-10-13 21:39:15 +01:00
AnyOldName3	ef7102899a	Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm	2017-10-13 21:26:58 +01:00