Merge remote branch 'origin/diabolik/more-lavacolors'
authortzork <jakob_mg@hotmail.com>
Tue, 1 Feb 2011 04:01:53 +0000 (05:01 +0100)
committertzork <jakob_mg@hotmail.com>
Tue, 1 Feb 2011 04:01:53 +0000 (05:01 +0100)
scripts/liquids_lava.shader
textures/liquids_lava/lava0_blue.tga [new file with mode: 0644]
textures/liquids_lava/lava0_blue_glow.tga [new file with mode: 0644]
textures/liquids_lava/lava0_green.tga [new file with mode: 0644]
textures/liquids_lava/lava0_green_glow.tga [new file with mode: 0644]
textures/liquids_lava/lava0_purple.tga [new file with mode: 0644]
textures/liquids_lava/lava0_purple_glow.tga [new file with mode: 0644]

index f2060c4..5d3f2d7 100644 (file)
@@ -31,3 +31,102 @@ textures/liquids_lava/lava0_flow
        }
 }
 
+textures/liquids_lava/lava0_blue
+{
+       qer_editorimage textures/liquids_lava/lava0_blue.tga
+       surfaceparm lava
+       surfaceparm noimpact
+       surfaceparm trans
+       cull disable
+       deformVertexes wave 150.0 sin 2 5 0.25 0.1
+       Q3map_TessSize 128
+       q3map_surfacelight 1000
+       q3map_lightSubdivide 64
+       {
+               map textures/liquids_lava/lava0_blue.tga
+               blendfunc add
+       }
+}
+
+textures/liquids_lava/lava0_blue_flow
+{
+       qer_editorimage textures/liquids_lava/lava0_blue.tga
+       surfaceparm lava
+       surfaceparm noimpact
+       surfaceparm trans
+       cull disable
+       q3map_surfacelight 1000
+       q3map_lightSubdivide 64
+       {
+               map textures/liquids_lava/lava0_blue.tga
+               blendfunc add
+               tcMod scroll 0 -0.25
+       }
+}
+
+textures/liquids_lava/lava0_green
+{
+       qer_editorimage textures/liquids_lava/lava0_green.tga
+       surfaceparm lava
+       surfaceparm noimpact
+       surfaceparm trans
+       cull disable
+       deformVertexes wave 150.0 sin 2 5 0.25 0.1
+       Q3map_TessSize 128
+       q3map_surfacelight 1000
+       q3map_lightSubdivide 64
+       {
+               map textures/liquids_lava/lava0_green.tga
+               blendfunc add
+       }
+}
+
+textures/liquids_lava/lava0_green_flow
+{
+       qer_editorimage textures/liquids_lava/lava0_green.tga
+       surfaceparm lava
+       surfaceparm noimpact
+       surfaceparm trans
+       cull disable
+       q3map_surfacelight 1000
+       q3map_lightSubdivide 64
+       {
+               map textures/liquids_lava/lava0_green.tga
+               blendfunc add
+               tcMod scroll 0 -0.25
+       }
+}
+
+textures/liquids_lava/lava0_purple
+{
+       qer_editorimage textures/liquids_lava/lava0_purple.tga
+       surfaceparm lava
+       surfaceparm noimpact
+       surfaceparm trans
+       cull disable
+       deformVertexes wave 150.0 sin 2 5 0.25 0.1
+       Q3map_TessSize 128
+       q3map_surfacelight 1000
+       q3map_lightSubdivide 64
+       {
+               map textures/liquids_lava/lava0_purple.tga
+               blendfunc add
+       }
+}
+
+textures/liquids_lava/lava0_purple_flow
+{
+       qer_editorimage textures/liquids_lava/lava0_purple.tga
+       surfaceparm lava
+       surfaceparm noimpact
+       surfaceparm trans
+       cull disable
+       q3map_surfacelight 1000
+       q3map_lightSubdivide 64
+       {
+               map textures/liquids_lava/lava0_purple.tga
+               blendfunc add
+               tcMod scroll 0 -0.25
+       }
+}
+
diff --git a/textures/liquids_lava/lava0_blue.tga b/textures/liquids_lava/lava0_blue.tga
new file mode 100644 (file)
index 0000000..936a538
Binary files /dev/null and b/textures/liquids_lava/lava0_blue.tga differ
diff --git a/textures/liquids_lava/lava0_blue_glow.tga b/textures/liquids_lava/lava0_blue_glow.tga
new file mode 100644 (file)
index 0000000..2485345
Binary files /dev/null and b/textures/liquids_lava/lava0_blue_glow.tga differ
diff --git a/textures/liquids_lava/lava0_green.tga b/textures/liquids_lava/lava0_green.tga
new file mode 100644 (file)
index 0000000..aa216ca
Binary files /dev/null and b/textures/liquids_lava/lava0_green.tga differ
diff --git a/textures/liquids_lava/lava0_green_glow.tga b/textures/liquids_lava/lava0_green_glow.tga
new file mode 100644 (file)
index 0000000..96d596d
Binary files /dev/null and b/textures/liquids_lava/lava0_green_glow.tga differ
diff --git a/textures/liquids_lava/lava0_purple.tga b/textures/liquids_lava/lava0_purple.tga
new file mode 100644 (file)
index 0000000..180621e
Binary files /dev/null and b/textures/liquids_lava/lava0_purple.tga differ
diff --git a/textures/liquids_lava/lava0_purple_glow.tga b/textures/liquids_lava/lava0_purple_glow.tga
new file mode 100644 (file)
index 0000000..26c364e
Binary files /dev/null and b/textures/liquids_lava/lava0_purple_glow.tga differ