10268 commits

Author	SHA1	Message	Date
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
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
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
scrawl	09d7681254	Merge pull request #1499 from lukago/bug4155 ... Bugfix #4155: NPCs don't equip a second ring in some cases	2017-10-13 19:35:03 +00:00
glbwsk	83a5c7c3d8	removed unnecessary comments, added gitignore for clion cmake	2017-10-13 20:32:52 +02:00
AnyOldName3	be50ed7387	Use a test image guaranteed to exist.	2017-10-13 18:27:32 +01:00
AnyOldName3	26a7b48d69	Attempt to make a VDSM work, and also to set up a debug HUD, but without success.	2017-10-13 18:19:29 +01:00
scrawl	548e90a7bc	Set cursor active when moving by controller	2017-10-13 16:22:44 +00:00
glbwsk	ff9cb22a58	npc swap cheaper ring during auto equip	2017-10-13 15:16:07 +02:00
glbwsk	e6e482ea98	added some comments for autoEquip	2017-10-13 14:47:26 +02:00