Merge branch 'cbrutail/newshader_pipelava' into cbrutail/darkzone

diff --git a/scripts/liquids_lava.shader b/scripts/liquids_lava.shader
index 95636257375a757e2cb6a0d8bdb2380789363212..3bb6a6c0699d7e912f810ce69e977cb7e0bc4fc2 100644 (file)
--- a/scripts/liquids_lava.shader
+++ b/scripts/liquids_lava.shader
@@ -38,7 +38,7 @@ textures/liquids_lava/lava0_flow_pipe
        surfaceparm noimpact
        surfaceparm trans
        cull disable
-       deformVertexes wave 10 sin 1 2 0.25 0.1
+       deformVertexes wave 4 sin 1 2 0.25 0.1
        q3map_surfacelight 1000
        q3map_lightSubdivide 64
        {
@@ -88,7 +88,7 @@ textures/liquids_lava/lava0_blue_flow_pipe
        surfaceparm noimpact
        surfaceparm trans
        cull disable
-       deformVertexes wave 150.0 sin 2 5 0.25 0.1
+       deformVertexes wave 4 sin 1 2 0.25 0.1
        q3map_surfacelight 1000
        q3map_lightSubdivide 64
        {
@@ -138,7 +138,7 @@ textures/liquids_lava/lava0_green_flow_pipe
        surfaceparm noimpact
        surfaceparm trans
        cull disable
-       deformVertexes wave 150.0 sin 2 5 0.25 0.1
+       deformVertexes wave 4 sin 1 2 0.25 0.1
        q3map_surfacelight 1000
        q3map_lightSubdivide 64
        {
@@ -188,7 +188,7 @@ textures/liquids_lava/lava0_purple_flow_pipe
        surfaceparm noimpact
        surfaceparm trans
        cull disable
-       deformVertexes wave 150.0 sin 2 5 0.25 0.1
+       deformVertexes wave 4 sin 1 2 0.25 0.1
        q3map_surfacelight 1000
        q3map_lightSubdivide 64
        {