18750 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
AnyOldName3	09b02c307a	Merge from base branch	2017-11-07 16:34:51 +00:00
AnyOldName3	56fa33af66	Enable parallel split shadow maps	2017-11-07 00:32:04 +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
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
AnyOldName3	2bfd45fb40	Merge pull request #2 from scrawl/shadows ... Enable shadows for terrain & restore cull mask	2017-11-03 00:38:57 +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
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
AnyOldName3	1d4b8656d1	Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm	2017-10-30 22:40:40 +00:00
AnyOldName3	e15d461921	Add (potentially physically-flawed) shadow support to the water shader	2017-10-30 20:06:52 +00:00
AnyOldName3	ab669a434e	Update the shadow frustrum bounds properly	2017-10-30 19:54:54 +00:00
scrawl	9c9da7b49f	Merge pull request #1527 from drummyfish/master ... Remove redundant condition	2017-10-28 15:59:35 +00: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	ae14aa0c84	Merge pull request #1522 from AnyOldName3/yet-another-cmake-fix ... Ensure the git-version target puts the version file in the appropriate directory/ies	2017-10-25 13:58:04 +00:00
scrawl	90f4e9530a	Merge pull request #1517 from ace13/update-osg ... Updating OSG packages to 3.4.1	2017-10-25 13:49:55 +00:00
AnyOldName3	c1a871ff1f	Make indentation consistent.	2017-10-24 23:31:40 +01:00
AnyOldName3	daf7d8451c	Switch to a more reliable method of passing the git-version targt the data it needs	2017-10-24 23:29:18 +01:00
AnyOldName3	e3142b9643	Add missing variables to those forwarded to the git-version target	2017-10-24 23:10:50 +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
Alexander "Ace" Olofsson	32bdd500af	Updating OSG packages to 3.4.1	2017-10-22 23:13:01 +02: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
scrawl	f3be39660b	Merge pull request #1516 from baszczewski/patch-1 ... Fix assert with empty setting value	2017-10-22 16:31:42 +00:00
Marcin Baszczewski	46b015d3d9	Fix assert with empty setting value ... Local value could be empty, so it's important to check it size before read first char.	2017-10-22 10:10:04 +02: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
scrawl	9be27193a3	Merge pull request #1512 from Rhiyo/patch-1 ... fixed new clothing replacing old clothing of same value	2017-10-19 14:54:27 +00: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