From: Rudolf Polzer <divverent@alientrap.org>
Date: Fri, 6 Aug 2010 22:56:55 +0000 (+0200)
Subject: Merge remote branch 'origin/mookow/liquids'
X-Git-Tag: xonotic-v0.1.0preview~141^2~5^2~1
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-maps.pk3dir.git;a=commitdiff_plain;h=24a94491bacea032fe544203db2d3a1bfb589bb9

Merge remote branch 'origin/mookow/liquids'

Conflicts:
	scripts/liquids.shader
---

24a94491bacea032fe544203db2d3a1bfb589bb9
diff --cc scripts/liquids_lava.shader
index 6e448dd4,00000000..e28e7065
mode 100644,000000..100644
--- a/scripts/liquids_lava.shader
+++ b/scripts/liquids_lava.shader
@@@ -1,16 -1,0 +1,31 @@@
- textures/liquids_lava/protolava
++textures/liquids_lava/lava0
 +{
- 	qer_editorimage textures/liquids_lava/protolava.jpg
- 	qer_trans 0.5
- 	surfaceparm trans
- 	surfaceparm nonsolid
++	qer_editorimage textures/liquids_lava/lava0.tga
 +	surfaceparm lava
++	surfaceparm noimpact
++	surfaceparm trans
++	cull disable
 +	deformVertexes wave 150.0 sin 2 5 0.25 0.1
 +	Q3map_TessSize 128
- 	cull none
++	q3map_surfacelight 1000
++	{
++		map textures/liquids_lava/lava0.tga
++		blendfunc add
++	}
++}
++
++textures/liquids_lava/lava0_flow
++{
++	qer_editorimage textures/liquids_lava/lava0.tga
++	surfaceparm lava
++	surfaceparm noimpact
++	surfaceparm trans
++	cull disable
++	q3map_surfacelight 1000
 +	{
- 		map textures/liquids_lava/protolava.jpg
- 		blendFunc add
- 		rgbGen identity
++		map textures/liquids_lava/lava0.tga
++		blendfunc add
++		tcMod scroll 0 -0.25
 +	}
 +}
++