From: Matthias Krüger Date: Sat, 8 Jun 2013 15:32:48 +0000 (+0200) Subject: map: solarium: remove textures/map_solarium/waterfall/water2.tga and use textures... X-Git-Tag: xonotic-v0.8.0~41^2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=145caec5a836be05bfd091f175605bed237516e3;p=xonotic%2Fxonotic-maps.pk3dir.git map: solarium: remove textures/map_solarium/waterfall/water2.tga and use textures/liquids_water/water2.tga instead since the files are the same. --- diff --git a/maps/solarium.map.options b/maps/solarium.map.options index 7acca23e..1e60fc0d 100644 --- a/maps/solarium.map.options +++ b/maps/solarium.map.options @@ -2,4 +2,4 @@ -vis + -light + -bounce 1 -dirty -dirtscale 1 -bouncescale 1 -areascale 0.10 -minimap + -Version: 4.1 \ No newline at end of file +Version: 5 diff --git a/scripts/map_solarium.shader b/scripts/map_solarium.shader index a498374b..107730c8 100644 --- a/scripts/map_solarium.shader +++ b/scripts/map_solarium.shader @@ -1,12 +1,12 @@ textures/map_solarium/waterfall { - qer_editorimage textures/map_solarium/waterfall/water2.tga + qer_editorimage textures/liquids_water/water2.tga qer_trans 20 cull disable surfaceparm trans { - map textures/map_solarium/waterfall/water2.tga + map textures/liquids_water/water2.tga tcMod scroll 0 -1.9 blendfunc blend diff --git a/textures/map_solarium/waterfall/water2.tga b/textures/map_solarium/waterfall/water2.tga deleted file mode 100644 index 233e397f..00000000 Binary files a/textures/map_solarium/waterfall/water2.tga and /dev/null differ diff --git a/textures/map_solarium/waterfall/water2_norm.tga b/textures/map_solarium/waterfall/water2_norm.tga deleted file mode 100644 index fb4fb22e..00000000 Binary files a/textures/map_solarium/waterfall/water2_norm.tga and /dev/null differ