Merge branch 'cbrutail/newshader_pipelava' into cbrutail/darkzone

diff --git a/scripts/liquids_lava.shader b/scripts/liquids_lava.shader
index 036be232c1199910ac060d624cb3490f23c87539..95636257375a757e2cb6a0d8bdb2380789363212 100644 (file)
--- a/scripts/liquids_lava.shader
+++ b/scripts/liquids_lava.shader
@@ -31,6 +31,23 @@ textures/liquids_lava/lava0_flow
        }
 }
 
+textures/liquids_lava/lava0_flow_pipe
+{
+       qer_editorimage textures/liquids_lava/lava0.tga
+       surfaceparm lava
+       surfaceparm noimpact
+       surfaceparm trans
+       cull disable
+       deformVertexes wave 10 sin 1 2 0.25 0.1
+       q3map_surfacelight 1000
+       q3map_lightSubdivide 64
+       {
+               map textures/liquids_lava/lava0.tga
+               blendfunc GL_SRC_ALPHA GL_ONE
+               tcMod scroll 0 -0.25
+       }
+}
+
 textures/liquids_lava/lava0_blue
 {
        qer_editorimage textures/liquids_lava/lava0_blue.tga
@@ -64,6 +81,23 @@ textures/liquids_lava/lava0_blue_flow
        }
 }
 
+textures/liquids_lava/lava0_blue_flow_pipe
+{
+       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_surfacelight 1000
+       q3map_lightSubdivide 64
+       {
+               map textures/liquids_lava/lava0_blue.tga
+               blendfunc GL_SRC_ALPHA GL_ONE
+               tcMod scroll 0 -0.25
+       }
+}
+
 textures/liquids_lava/lava0_green
 {
        qer_editorimage textures/liquids_lava/lava0_green.tga
@@ -97,6 +131,23 @@ textures/liquids_lava/lava0_green_flow
        }
 }
 
+textures/liquids_lava/lava0_green_flow_pipe
+{
+       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_surfacelight 1000
+       q3map_lightSubdivide 64
+       {
+               map textures/liquids_lava/lava0_green.tga
+               blendfunc GL_SRC_ALPHA GL_ONE
+               tcMod scroll 0 -0.25
+       }
+}
+
 textures/liquids_lava/lava0_purple
 {
        qer_editorimage textures/liquids_lava/lava0_purple.tga
@@ -130,3 +181,19 @@ textures/liquids_lava/lava0_purple_flow
        }
 }
 
+textures/liquids_lava/lava0_purple_flow_pipe
+{
+       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_surfacelight 1000
+       q3map_lightSubdivide 64
+       {
+               map textures/liquids_lava/lava0_purple.tga
+               blendfunc GL_SRC_ALPHA GL_ONE
+               tcMod scroll 0 -0.25
+       }
+}
\ No newline at end of file