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 6182b024070f4ecf6a8584d1711573668616b569..d5d280aa0890b6f6370b95c5357024197b53076e 100644 (file)
--- 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 (file)
index 0000000..10d8cae
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 (file)
index 0000000..f4ea05c
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 (file)
index 0000000..a6e1039
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 (file)
index 0000000..df5364f
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 (file)
index 10d8cae..0000000
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 (file)
index f4ea05c..0000000
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 (file)
index a6e1039..0000000
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 (file)
index df5364f..0000000
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 (file)
index 85f9a87..0000000
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 (file)
index 0000000..85f9a87
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 (file)
index 6feefb9..0000000
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 (file)
index aa108e9..0000000
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 (file)
index d7abe52..0000000
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 (file)
index e1b3750..0000000
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 (file)
index 407a41f..0000000
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 (file)
index dd4cd79..0000000
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 (file)
index 27125f6..0000000
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 (file)
index 25cb097..0000000
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 (file)
index 08d5a11..0000000
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 (file)
index f43ca7e..0000000
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 (file)
index 2281e13..0000000
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 (file)
index 8cc9c8c..0000000
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 (file)
index 0000000..08d5a11
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 (file)
index 0000000..f43ca7e
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 (file)
index 0000000..2281e13
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 (file)
index 0000000..8cc9c8c
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 (file)
index 0000000..6feefb9
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 (file)
index 0000000..aa108e9
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 (file)
index 0000000..d7abe52
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 (file)
index 0000000..e1b3750
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 (file)
index 0000000..407a41f
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 (file)
index 0000000..dd4cd79
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 (file)
index 0000000..27125f6
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 (file)
index 0000000..25cb097
Binary files /dev/null and b/textures/exomorphx/wall/metal_wall04_reflect.tga differ