From: Matthias Krüger Date: Sat, 8 Jun 2013 15:28:35 +0000 (+0200) Subject: maps: g-23: remove textures/map_g-23/conveyorbelt/conveyorbelt.tga and use textures... X-Git-Tag: xonotic-v0.8.0~41^2~3 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1aa6ed1b252089c957fd3ed740628cae3664e60d;p=xonotic%2Fxonotic-maps.pk3dir.git maps: g-23: remove textures/map_g-23/conveyorbelt/conveyorbelt.tga and use textures/exx/trim/trim_psimple05.tga instead since the files are the same. --- diff --git a/maps/g-23.map.options b/maps/g-23.map.options index 7762aa50..288ca90d 100644 --- a/maps/g-23.map.options +++ b/maps/g-23.map.options @@ -3,4 +3,4 @@ -vis + -minimap + -sRGB -Version: 8 // ten times golden section +Version: 9 diff --git a/scripts/map_g-23.shader b/scripts/map_g-23.shader index ff784273..18c5371e 100644 --- a/scripts/map_g-23.shader +++ b/scripts/map_g-23.shader @@ -1,6 +1,6 @@ textures/map_g-23/conveyor_belt { - qer_editorimage textures/map_g-23/conveyorbelt/conveyorbelt.tga + qer_editorimage textures/exx/trim/trim_psimple05.tga surfaceparm metalsteps surfaceparm nomarks // decals on tcmod = stupid q3map_bounceScale 1.5 @@ -9,7 +9,7 @@ textures/map_g-23/conveyor_belt dpglossexponentmod 4 { - map textures/map_g-23/conveyorbelt/conveyorbelt.tga + map textures/exx/trim/trim_psimple05.tga tcMod scroll 0 0.25 } } diff --git a/textures/map_g-23/conveyorbelt/conveyorbelt.tga b/textures/map_g-23/conveyorbelt/conveyorbelt.tga deleted file mode 100644 index 0ec7bf12..00000000 Binary files a/textures/map_g-23/conveyorbelt/conveyorbelt.tga and /dev/null differ diff --git a/textures/map_g-23/conveyorbelt/conveyorbelt_gloss.tga b/textures/map_g-23/conveyorbelt/conveyorbelt_gloss.tga deleted file mode 100644 index 75fcbaa6..00000000 Binary files a/textures/map_g-23/conveyorbelt/conveyorbelt_gloss.tga and /dev/null differ diff --git a/textures/map_g-23/conveyorbelt/conveyorbelt_norm.tga b/textures/map_g-23/conveyorbelt/conveyorbelt_norm.tga deleted file mode 100644 index 5a2d8eaa..00000000 Binary files a/textures/map_g-23/conveyorbelt/conveyorbelt_norm.tga and /dev/null differ