From: Rudolf Polzer Date: Wed, 14 Aug 2013 08:33:16 +0000 (+0200) Subject: Revert "moving 2 textures to 'base'" X-Git-Tag: xonotic-v0.8.0~27 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=bd4eebf3a7acdb1f889fb9905175b984201b8008;p=xonotic%2Fxonotic-maps.pk3dir.git Revert "moving 2 textures to 'base'" This reverts commit baf1d487a81f92b8452e38efdb0a18ca6a1bb211. --- diff --git a/scripts/exomorphx.shader b/scripts/exomorphx.shader index d5d280aa..78cfb384 100644 --- a/scripts/exomorphx.shader +++ b/scripts/exomorphx.shader @@ -1694,9 +1694,9 @@ textures/exomorphx/floor-metal_floor04a } } -textures/exomorphx/base-metal_floor04b +textures/exomorphx/floor-metal_floor04b { - qer_editorimage textures/exomorphx/base/metal_floor04b + qer_editorimage textures/exomorphx/floor/metal_floor04b dpoffsetmapping - 2.28641290560094684604 match8 220.49524300000000000000 dpglossintensitymod 2 dpglossexponentmod 4 @@ -1705,7 +1705,7 @@ textures/exomorphx/base-metal_floor04b q3map_bouncescale 1.50 { - map textures/exomorphx/base/metal_floor04b + map textures/exomorphx/floor/metal_floor04b } { @@ -1716,9 +1716,9 @@ textures/exomorphx/base-metal_floor04b } } -textures/exomorphx/base-metal_floor04c +textures/exomorphx/floor-metal_floor04c { - qer_editorimage textures/exomorphx/base/metal_floor04c + qer_editorimage textures/exomorphx/floor/metal_floor04c dpoffsetmapping - 2.28641290560094684604 match8 220.49524300000000000000 dpglossintensitymod 2 dpglossexponentmod 4 @@ -1727,7 +1727,7 @@ textures/exomorphx/base-metal_floor04c q3map_bouncescale 1.50 { - map textures/exomorphx/base/metal_floor04c + map textures/exomorphx/floor/metal_floor04c } { diff --git a/textures/exomorphx/base/metal_floor04b.tga b/textures/exomorphx/base/metal_floor04b.tga deleted file mode 100644 index 6b7b0671..00000000 Binary files a/textures/exomorphx/base/metal_floor04b.tga and /dev/null differ diff --git a/textures/exomorphx/base/metal_floor04b_gloss.tga b/textures/exomorphx/base/metal_floor04b_gloss.tga deleted file mode 100644 index c11fc1d4..00000000 Binary files a/textures/exomorphx/base/metal_floor04b_gloss.tga and /dev/null differ diff --git a/textures/exomorphx/base/metal_floor04b_norm.tga b/textures/exomorphx/base/metal_floor04b_norm.tga deleted file mode 100644 index 2e46409a..00000000 Binary files a/textures/exomorphx/base/metal_floor04b_norm.tga and /dev/null differ diff --git a/textures/exomorphx/base/metal_floor04b_reflect.tga b/textures/exomorphx/base/metal_floor04b_reflect.tga deleted file mode 100644 index 0c9cb68a..00000000 Binary files a/textures/exomorphx/base/metal_floor04b_reflect.tga and /dev/null differ diff --git a/textures/exomorphx/base/metal_floor04c.tga b/textures/exomorphx/base/metal_floor04c.tga deleted file mode 100644 index 6c36418f..00000000 Binary files a/textures/exomorphx/base/metal_floor04c.tga and /dev/null differ diff --git a/textures/exomorphx/base/metal_floor04c_gloss.tga b/textures/exomorphx/base/metal_floor04c_gloss.tga deleted file mode 100644 index 2621ef5d..00000000 Binary files a/textures/exomorphx/base/metal_floor04c_gloss.tga and /dev/null differ diff --git a/textures/exomorphx/base/metal_floor04c_norm.tga b/textures/exomorphx/base/metal_floor04c_norm.tga deleted file mode 100644 index 719b6c32..00000000 Binary files a/textures/exomorphx/base/metal_floor04c_norm.tga and /dev/null differ diff --git a/textures/exomorphx/base/metal_floor04c_reflect.tga b/textures/exomorphx/base/metal_floor04c_reflect.tga deleted file mode 100644 index 01f0164c..00000000 Binary files a/textures/exomorphx/base/metal_floor04c_reflect.tga and /dev/null differ diff --git a/textures/exomorphx/floor/metal_floor04b.tga b/textures/exomorphx/floor/metal_floor04b.tga new file mode 100644 index 00000000..6b7b0671 Binary files /dev/null and b/textures/exomorphx/floor/metal_floor04b.tga differ diff --git a/textures/exomorphx/floor/metal_floor04b_gloss.tga b/textures/exomorphx/floor/metal_floor04b_gloss.tga new file mode 100644 index 00000000..c11fc1d4 Binary files /dev/null and b/textures/exomorphx/floor/metal_floor04b_gloss.tga differ diff --git a/textures/exomorphx/floor/metal_floor04b_norm.tga b/textures/exomorphx/floor/metal_floor04b_norm.tga new file mode 100644 index 00000000..2e46409a Binary files /dev/null and b/textures/exomorphx/floor/metal_floor04b_norm.tga differ diff --git a/textures/exomorphx/floor/metal_floor04b_reflect.tga b/textures/exomorphx/floor/metal_floor04b_reflect.tga new file mode 100644 index 00000000..0c9cb68a Binary files /dev/null and b/textures/exomorphx/floor/metal_floor04b_reflect.tga differ diff --git a/textures/exomorphx/floor/metal_floor04c.tga b/textures/exomorphx/floor/metal_floor04c.tga new file mode 100644 index 00000000..6c36418f Binary files /dev/null and b/textures/exomorphx/floor/metal_floor04c.tga differ diff --git a/textures/exomorphx/floor/metal_floor04c_gloss.tga b/textures/exomorphx/floor/metal_floor04c_gloss.tga new file mode 100644 index 00000000..2621ef5d Binary files /dev/null and b/textures/exomorphx/floor/metal_floor04c_gloss.tga differ diff --git a/textures/exomorphx/floor/metal_floor04c_norm.tga b/textures/exomorphx/floor/metal_floor04c_norm.tga new file mode 100644 index 00000000..719b6c32 Binary files /dev/null and b/textures/exomorphx/floor/metal_floor04c_norm.tga differ diff --git a/textures/exomorphx/floor/metal_floor04c_reflect.tga b/textures/exomorphx/floor/metal_floor04c_reflect.tga new file mode 100644 index 00000000..01f0164c Binary files /dev/null and b/textures/exomorphx/floor/metal_floor04c_reflect.tga differ