From: ssinghal Date: Tue, 1 Feb 2011 20:21:29 +0000 (-0500) Subject: Merge remote branch 'origin/master' into diabolik/afterslime X-Git-Tag: xonotic-v0.5.0~98^2~18^2^2~13 X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-maps.pk3dir.git;a=commitdiff_plain;h=df5fd3ce1487ab96f54d53302a6619962763457d;hp=c87f4671fcb3d88d01dcd577ef6e6e66eca0da34 Merge remote branch 'origin/master' into diabolik/afterslime --- diff --git a/scripts/liquids_lava.shader b/scripts/liquids_lava.shader index f2060c4f..5d3f2d79 100644 --- a/scripts/liquids_lava.shader +++ b/scripts/liquids_lava.shader @@ -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 index 00000000..936a5381 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 index 00000000..24853450 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 index 00000000..aa216cad 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 index 00000000..96d596d5 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 index 00000000..180621e4 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 index 00000000..26c364e2 Binary files /dev/null and b/textures/liquids_lava/lava0_purple_glow.tga differ