Merge remote branch 'origin/mookow/liquids'

Conflicts:
	scripts/liquids.shader

diff --cc scripts/liquids_lava.shader
index 6e448dd4898927e0bcb5854b2541b62c83287bb8,0000000000000000000000000000000000000000..e28e7065ae628e5f435998eb0095fa8a7498c574
mode 100644,000000..100644
--- 1/scripts/liquids_lava.shader
--- /dev/null
+++ 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
 +      }
 +}
++