From: Rudolf Polzer Date: Wed, 14 Aug 2013 08:28:12 +0000 (+0200) Subject: Revert "renaming a few textures" as that breaks existing maps. X-Git-Tag: xonotic-v0.8.0~28 X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-maps.pk3dir.git;a=commitdiff_plain;h=25caff843dad3b2ed14a3f20474836884734cbc6 Revert "renaming a few textures" as that breaks existing maps. If you want to rename textures, make the previous shader name continue working. Possibly hide it from Radiant though (q3map_deprecateShader can e.g. do that). This reverts commit 57116a039162d2a4099a7e00857a0c5ebe8f0077. --- diff --git a/scripts/exomorphx.shader b/scripts/exomorphx.shader index 6182b024..d5d280aa 100644 --- a/scripts/exomorphx.shader +++ b/scripts/exomorphx.shader @@ -863,9 +863,9 @@ textures/exomorphx/wall-metal_panel01 } -textures/exomorphx/panel-metal_wall04 +textures/exomorphx/wall-metal_wall04 { - qer_editorimage textures/exomorphx/panel/metal_wall04 + qer_editorimage textures/exomorphx/wall/metal_wall04 dpoffsetmapping - 1.52193054519870410374 match8 255 dpglossintensitymod 2 dpglossexponentmod 4 @@ -874,7 +874,7 @@ textures/exomorphx/panel-metal_wall04 q3map_bouncescale 1.50 { - map textures/exomorphx/panel/metal_wall04 + map textures/exomorphx/wall/metal_wall04 } { @@ -908,9 +908,9 @@ textures/exomorphx/wall-concrete_wall_slab01 } -textures/exomorphx/panel-metal_wall03 +textures/exomorphx/wall-metal_wall03 { - qer_editorimage textures/exomorphx/panel/metal_wall03 + qer_editorimage textures/exomorphx/wall/metal_wall03 dpoffsetmapping - 3.13442224680592611975 match8 184.93727500000000000000 dpglossintensitymod 2 dpglossexponentmod 4 @@ -919,7 +919,7 @@ textures/exomorphx/panel-metal_wall03 q3map_bouncescale 1.50 { - map textures/exomorphx/panel/metal_wall03 + map textures/exomorphx/wall/metal_wall03 } { @@ -1344,9 +1344,9 @@ textures/exomorphx/light-metal_light07 } -textures/exomorphx/light-metal_light04_red +textures/exomorphx/light-metal_light04 { - qer_editorimage textures/exomorphx/light/metal_light04_red + qer_editorimage textures/exomorphx/light/metal_light04 dpoffsetmapping - .89493873437289361705 match8 124.51321500000000000000 dpglossintensitymod 2 dpglossexponentmod 4 @@ -1355,7 +1355,7 @@ textures/exomorphx/light-metal_light04_red q3map_bouncescale 1.50 { - map textures/exomorphx/light/metal_light04_red + map textures/exomorphx/light/metal_light04 } { @@ -2438,9 +2438,9 @@ textures/exomorphx/wall-concrete_wall_slab03stripes } } -textures/exomorphx/wall-metal_panel01_rust +textures/exomorphx/wall-metal_panel02rust { - qer_editorimage textures/exomorphx/wall/metal_panel01_rust + qer_editorimage textures/exomorphx/wall/metal_panel02rust dpoffsetmapping - .71825975354494740329 match8 227.04564900000000000000 dpglossintensitymod 2 dpglossexponentmod 4 @@ -2449,7 +2449,7 @@ textures/exomorphx/wall-metal_panel01_rust q3map_bouncescale 1.50 { - map textures/exomorphx/wall/metal_panel01_rust + map textures/exomorphx/wall/metal_panel02rust } { diff --git a/textures/exomorphx/light/metal_light04.tga b/textures/exomorphx/light/metal_light04.tga new file mode 100644 index 00000000..10d8cae1 Binary files /dev/null and b/textures/exomorphx/light/metal_light04.tga differ diff --git a/textures/exomorphx/light/metal_light04_gloss.tga b/textures/exomorphx/light/metal_light04_gloss.tga new file mode 100644 index 00000000..f4ea05c0 Binary files /dev/null and b/textures/exomorphx/light/metal_light04_gloss.tga differ diff --git a/textures/exomorphx/light/metal_light04_glow.tga b/textures/exomorphx/light/metal_light04_glow.tga new file mode 100644 index 00000000..a6e1039b Binary files /dev/null and b/textures/exomorphx/light/metal_light04_glow.tga differ diff --git a/textures/exomorphx/light/metal_light04_norm.tga b/textures/exomorphx/light/metal_light04_norm.tga new file mode 100644 index 00000000..df5364f2 Binary files /dev/null and b/textures/exomorphx/light/metal_light04_norm.tga differ diff --git a/textures/exomorphx/light/metal_light04_red.tga b/textures/exomorphx/light/metal_light04_red.tga deleted file mode 100644 index 10d8cae1..00000000 Binary files a/textures/exomorphx/light/metal_light04_red.tga and /dev/null differ diff --git a/textures/exomorphx/light/metal_light04_red_gloss.tga b/textures/exomorphx/light/metal_light04_red_gloss.tga deleted file mode 100644 index f4ea05c0..00000000 Binary files a/textures/exomorphx/light/metal_light04_red_gloss.tga and /dev/null differ diff --git a/textures/exomorphx/light/metal_light04_red_glow.tga b/textures/exomorphx/light/metal_light04_red_glow.tga deleted file mode 100644 index a6e1039b..00000000 Binary files a/textures/exomorphx/light/metal_light04_red_glow.tga and /dev/null differ diff --git a/textures/exomorphx/light/metal_light04_red_norm.tga b/textures/exomorphx/light/metal_light04_red_norm.tga deleted file mode 100644 index df5364f2..00000000 Binary files a/textures/exomorphx/light/metal_light04_red_norm.tga and /dev/null differ diff --git a/textures/exomorphx/light/metal_light04_red_reflect.tga b/textures/exomorphx/light/metal_light04_red_reflect.tga deleted file mode 100644 index 85f9a87b..00000000 Binary files a/textures/exomorphx/light/metal_light04_red_reflect.tga and /dev/null differ diff --git a/textures/exomorphx/light/metal_light04_reflect.tga b/textures/exomorphx/light/metal_light04_reflect.tga new file mode 100644 index 00000000..85f9a87b Binary files /dev/null and b/textures/exomorphx/light/metal_light04_reflect.tga differ diff --git a/textures/exomorphx/panel/metal_wall03.tga b/textures/exomorphx/panel/metal_wall03.tga deleted file mode 100644 index 6feefb92..00000000 Binary files a/textures/exomorphx/panel/metal_wall03.tga and /dev/null differ diff --git a/textures/exomorphx/panel/metal_wall03_gloss.tga b/textures/exomorphx/panel/metal_wall03_gloss.tga deleted file mode 100644 index aa108e96..00000000 Binary files a/textures/exomorphx/panel/metal_wall03_gloss.tga and /dev/null differ diff --git a/textures/exomorphx/panel/metal_wall03_norm.tga b/textures/exomorphx/panel/metal_wall03_norm.tga deleted file mode 100644 index d7abe52f..00000000 Binary files a/textures/exomorphx/panel/metal_wall03_norm.tga and /dev/null differ diff --git a/textures/exomorphx/panel/metal_wall03_reflect.tga b/textures/exomorphx/panel/metal_wall03_reflect.tga deleted file mode 100644 index e1b37507..00000000 Binary files a/textures/exomorphx/panel/metal_wall03_reflect.tga and /dev/null differ diff --git a/textures/exomorphx/panel/metal_wall04.tga b/textures/exomorphx/panel/metal_wall04.tga deleted file mode 100644 index 407a41f5..00000000 Binary files a/textures/exomorphx/panel/metal_wall04.tga and /dev/null differ diff --git a/textures/exomorphx/panel/metal_wall04_gloss.tga b/textures/exomorphx/panel/metal_wall04_gloss.tga deleted file mode 100644 index dd4cd799..00000000 Binary files a/textures/exomorphx/panel/metal_wall04_gloss.tga and /dev/null differ diff --git a/textures/exomorphx/panel/metal_wall04_norm.tga b/textures/exomorphx/panel/metal_wall04_norm.tga deleted file mode 100644 index 27125f64..00000000 Binary files a/textures/exomorphx/panel/metal_wall04_norm.tga and /dev/null differ diff --git a/textures/exomorphx/panel/metal_wall04_reflect.tga b/textures/exomorphx/panel/metal_wall04_reflect.tga deleted file mode 100644 index 25cb097b..00000000 Binary files a/textures/exomorphx/panel/metal_wall04_reflect.tga and /dev/null differ diff --git a/textures/exomorphx/wall/metal_panel01_rust.tga b/textures/exomorphx/wall/metal_panel01_rust.tga deleted file mode 100644 index 08d5a114..00000000 Binary files a/textures/exomorphx/wall/metal_panel01_rust.tga and /dev/null differ diff --git a/textures/exomorphx/wall/metal_panel01_rust_gloss.tga b/textures/exomorphx/wall/metal_panel01_rust_gloss.tga deleted file mode 100644 index f43ca7e6..00000000 Binary files a/textures/exomorphx/wall/metal_panel01_rust_gloss.tga and /dev/null differ diff --git a/textures/exomorphx/wall/metal_panel01_rust_norm.tga b/textures/exomorphx/wall/metal_panel01_rust_norm.tga deleted file mode 100644 index 2281e13f..00000000 Binary files a/textures/exomorphx/wall/metal_panel01_rust_norm.tga and /dev/null differ diff --git a/textures/exomorphx/wall/metal_panel01_rust_reflect.tga b/textures/exomorphx/wall/metal_panel01_rust_reflect.tga deleted file mode 100644 index 8cc9c8c1..00000000 Binary files a/textures/exomorphx/wall/metal_panel01_rust_reflect.tga and /dev/null differ diff --git a/textures/exomorphx/wall/metal_panel02rust.tga b/textures/exomorphx/wall/metal_panel02rust.tga new file mode 100644 index 00000000..08d5a114 Binary files /dev/null and b/textures/exomorphx/wall/metal_panel02rust.tga differ diff --git a/textures/exomorphx/wall/metal_panel02rust_gloss.tga b/textures/exomorphx/wall/metal_panel02rust_gloss.tga new file mode 100644 index 00000000..f43ca7e6 Binary files /dev/null and b/textures/exomorphx/wall/metal_panel02rust_gloss.tga differ diff --git a/textures/exomorphx/wall/metal_panel02rust_norm.tga b/textures/exomorphx/wall/metal_panel02rust_norm.tga new file mode 100644 index 00000000..2281e13f Binary files /dev/null and b/textures/exomorphx/wall/metal_panel02rust_norm.tga differ diff --git a/textures/exomorphx/wall/metal_panel02rust_reflect.tga b/textures/exomorphx/wall/metal_panel02rust_reflect.tga new file mode 100644 index 00000000..8cc9c8c1 Binary files /dev/null and b/textures/exomorphx/wall/metal_panel02rust_reflect.tga differ diff --git a/textures/exomorphx/wall/metal_wall03.tga b/textures/exomorphx/wall/metal_wall03.tga new file mode 100644 index 00000000..6feefb92 Binary files /dev/null and b/textures/exomorphx/wall/metal_wall03.tga differ diff --git a/textures/exomorphx/wall/metal_wall03_gloss.tga b/textures/exomorphx/wall/metal_wall03_gloss.tga new file mode 100644 index 00000000..aa108e96 Binary files /dev/null and b/textures/exomorphx/wall/metal_wall03_gloss.tga differ diff --git a/textures/exomorphx/wall/metal_wall03_norm.tga b/textures/exomorphx/wall/metal_wall03_norm.tga new file mode 100644 index 00000000..d7abe52f Binary files /dev/null and b/textures/exomorphx/wall/metal_wall03_norm.tga differ diff --git a/textures/exomorphx/wall/metal_wall03_reflect.tga b/textures/exomorphx/wall/metal_wall03_reflect.tga new file mode 100644 index 00000000..e1b37507 Binary files /dev/null and b/textures/exomorphx/wall/metal_wall03_reflect.tga differ diff --git a/textures/exomorphx/wall/metal_wall04.tga b/textures/exomorphx/wall/metal_wall04.tga new file mode 100644 index 00000000..407a41f5 Binary files /dev/null and b/textures/exomorphx/wall/metal_wall04.tga differ diff --git a/textures/exomorphx/wall/metal_wall04_gloss.tga b/textures/exomorphx/wall/metal_wall04_gloss.tga new file mode 100644 index 00000000..dd4cd799 Binary files /dev/null and b/textures/exomorphx/wall/metal_wall04_gloss.tga differ diff --git a/textures/exomorphx/wall/metal_wall04_norm.tga b/textures/exomorphx/wall/metal_wall04_norm.tga new file mode 100644 index 00000000..27125f64 Binary files /dev/null and b/textures/exomorphx/wall/metal_wall04_norm.tga differ diff --git a/textures/exomorphx/wall/metal_wall04_reflect.tga b/textures/exomorphx/wall/metal_wall04_reflect.tga new file mode 100644 index 00000000..25cb097b Binary files /dev/null and b/textures/exomorphx/wall/metal_wall04_reflect.tga differ