Merge branch 'morphed/ionpump' of ssh://git.xonotic.org/xonotic-maps.pk3dir into...

diff --combined scripts/liquids_water.shader
index 16257e6522830d586a909681b227c1ef1601fb65,99c5c054fdf4a673733d88bf9a1e65f4459a56fc..19631cb5fcad1193984b8233aaa08310dbfdec2c
--- 1/scripts/liquids_water.shader
--- 2/scripts/liquids_water.shader
+++ b/scripts/liquids_water.shader
@@@ -16,7 -16,7 +16,7 @@@ textures/liquids_water/water
                tcmod scale 1.2 0.7
                blendfunc blend
        }
-       dp_water 0.1 0.8  3 3  1 1 1  1 1 1  0.125
+       dp_water 0.1 0.25  3 3  1 1 1  1 1 1  0.125
  }
  
  textures/liquids_water/water0_cubemap
@@@ -29,9 -29,9 +29,9 @@@
        cull none
        q3map_globaltexture
        tessSize 256
 -      qer_editorimage textures/liquids_water/water0_reflect.tga
 +      qer_editorimage textures/liquids_water/water0c_reflect.tga
        {
 -              map textures/liquids_water/water0.tga
 +              map textures/liquids_water/water0c.tga
                tcMod turb 0 0.4 0 0.08
                blendfunc add
        }
@@@ -59,7 -59,7 +59,7 @@@ textures/liquids_water/water
                tcmod scale 1.2 0.7
                blendfunc blend
        }
-       dp_water 0.1 0.8  3 3  1 1 1  1 1 1  0.125
+       dp_water 0.1 0.25  3 3  1 1 1  1 1 1  0.125
  }
  
  textures/liquids_water/water2
@@@ -78,7 -78,7 +78,7 @@@
                tcmod scale 1.2 0.7
                blendfunc blend
        }
-       dp_water 0.1 0.8  3 3  1 1 1  1 1 1  0.125
+       dp_water 0.1 0.25  3 3  1 1 1  1 1 1  0.125
  }
  
  textures/liquids_water/ruiner_water