From: MooKow Date: Fri, 6 Aug 2010 22:50:52 +0000 (-0500) Subject: Removed protolava and added lava0 (originally xonotic-nexcompat.pk3dir/textures/storm... X-Git-Tag: xonotic-v0.1.0preview~141^2~5^2~1^2~1 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c6f5b78ef890d9e6c86948ce00b9de8afd8e5d79;p=xonotic%2Fxonotic-maps.pk3dir.git Removed protolava and added lava0 (originally xonotic-nexcompat.pk3dir/textures/stormkeep/lava.tga) --- diff --git a/scripts/liquids.shader b/scripts/liquids.shader index 56d13765..52adc54c 100644 --- a/scripts/liquids.shader +++ b/scripts/liquids.shader @@ -114,19 +114,34 @@ textures/liquids_slime/slime1 dp_water 0.1 0.8 3 3 1 1 0.5 1 1 0.5 0.75 } -textures/liquids_lava/protolava +textures/stormkeep/lava0 { - qer_editorimage textures/liquids_lava/protolava.jpg - qer_trans 0.5 - surfaceparm trans - surfaceparm nonsolid + qer_editorimage textures/stormkeep/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/protolava.jpg - blendFunc add - rgbGen identity + map textures/stormkeep/lava0.tga + blendfunc add } } + +textures/stormkeep/lava0_flow +{ + qer_editorimage textures/stormkeep/lava0.tga + surfaceparm lava + surfaceparm noimpact + surfaceparm trans + cull disable + q3map_surfacelight 1000 + { + map textures/stormkeep/lava0.tga + blendfunc add + tcMod scroll 0 -0.25 + } +} + diff --git a/textures/liquids_lava/lava0.tga b/textures/liquids_lava/lava0.tga new file mode 100644 index 00000000..b6026926 Binary files /dev/null and b/textures/liquids_lava/lava0.tga differ diff --git a/textures/liquids_lava/lava0_glow.tga b/textures/liquids_lava/lava0_glow.tga new file mode 100644 index 00000000..f08a0884 Binary files /dev/null and b/textures/liquids_lava/lava0_glow.tga differ diff --git a/textures/liquids_lava/protolava.jpg b/textures/liquids_lava/protolava.jpg deleted file mode 100644 index 20083cc4..00000000 Binary files a/textures/liquids_lava/protolava.jpg and /dev/null differ diff --git a/textures/liquids_lava/protolava_glow.jpg b/textures/liquids_lava/protolava_glow.jpg deleted file mode 100644 index 166ee798..00000000 Binary files a/textures/liquids_lava/protolava_glow.jpg and /dev/null differ diff --git a/textures/liquids_lava/protolava_norm.jpg b/textures/liquids_lava/protolava_norm.jpg deleted file mode 100644 index 413cefed..00000000 Binary files a/textures/liquids_lava/protolava_norm.jpg and /dev/null differ