13858 commits

Author	SHA1	Message	Date
Marc Zinnschlag	bdabace7e2	Merge remote-tracking branch 'aesylwinn/LLmerge'	2017-10-19 14:24:58 +02: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	43e9e955c8	Do the same for the CS	2017-10-18 02:04:48 +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
Kyle Cooley	6d7a24224b	Add documentation.	2017-10-16 12:52:13 -04:00
AnyOldName3	654bd401fb	Switch openmw-cs to the escape versions of option types	2017-10-16 15:38:17 +01: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
Kyle Cooley	11eae16645	Get rid of duplicate function, fix flag checking	2017-10-14 15:09:12 -04:00
Kyle Cooley	d27071f06a	Fix LTEX import bug.	2017-10-14 13:18:54 -04:00
Kyle Cooley	98c38ad7d1	Merge cleanup.	2017-10-14 13:18:31 -04:00
Kyle Cooley	6d9d98c02c	Merge Land/LandTextures	2017-10-14 11:32:42 -04: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
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
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
glbwsk	a25903b075	fixed autoequiping rings by npc - now checks if right hand is free	2017-10-13 14:39:44 +02:00
scrawl	479f9535b4	Allow training window exit()	2017-10-08 20:38:20 +00:00
scrawl	9cde3e4408	Merge pull request #1495 from akortunov/regressions ... Add showsInInventory() check to the ContainerItemModel	2017-10-08 14:09:59 +00:00
Andrei Kortunov	ea3729790f	Add showsInInventory() check to the ContainerItemModel	2017-10-08 09:20:07 +04:00
Kyle Cooley	b14404e9cc	Fix region colors	2017-10-06 20:05:06 -04:00
scrawl	7021d354c6	Merge pull request #1493 from akortunov/regressions ... Regression fixes	2017-10-06 16:21:16 +00:00
scrawl	2805781542	Fix a crash when exit() already hides the window (Fixes #4148)	2017-10-06 16:18:57 +00:00
Andrei Kortunov	ad27e0f945	Fix owned tooltip in the spellwindow	2017-10-06 11:38:27 +04:00
Andrei Kortunov	e2afd3690c	Remove item by id from InventoryStore	2017-10-06 10:54:25 +04:00
scrawl	842a42ee66	Fix non-top level Windows accepting key focus	2017-10-05 18:41:02 +02:00
scrawl	8c0790580a	Add screen fading for exterior cell transitions	2017-10-05 18:41:02 +02:00
scrawl	cd437f094d	Fix exiting savegamedialog with 'esc' when no game is running	2017-10-05 18:35:09 +02:00