From 25caff843dad3b2ed14a3f20474836884734cbc6 Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Wed, 14 Aug 2013 10:28:12 +0200 Subject: [PATCH] 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. --- scripts/exomorphx.shader | 24 +++++++++--------- ...etal_light04_red.tga => metal_light04.tga} | Bin ..._red_gloss.tga => metal_light04_gloss.tga} | Bin ...04_red_glow.tga => metal_light04_glow.tga} | Bin ...04_red_norm.tga => metal_light04_norm.tga} | Bin ..._reflect.tga => metal_light04_reflect.tga} | Bin ...panel01_rust.tga => metal_panel02rust.tga} | Bin ..._gloss.tga => metal_panel02rust_gloss.tga} | Bin ...st_norm.tga => metal_panel02rust_norm.tga} | Bin ...lect.tga => metal_panel02rust_reflect.tga} | Bin .../{panel => wall}/metal_wall03.tga | Bin .../{panel => wall}/metal_wall03_gloss.tga | Bin .../{panel => wall}/metal_wall03_norm.tga | Bin .../{panel => wall}/metal_wall03_reflect.tga | Bin .../{panel => wall}/metal_wall04.tga | Bin .../{panel => wall}/metal_wall04_gloss.tga | Bin .../{panel => wall}/metal_wall04_norm.tga | Bin .../{panel => wall}/metal_wall04_reflect.tga | Bin 18 files changed, 12 insertions(+), 12 deletions(-) rename textures/exomorphx/light/{metal_light04_red.tga => metal_light04.tga} (100%) rename textures/exomorphx/light/{metal_light04_red_gloss.tga => metal_light04_gloss.tga} (100%) rename textures/exomorphx/light/{metal_light04_red_glow.tga => metal_light04_glow.tga} (100%) rename textures/exomorphx/light/{metal_light04_red_norm.tga => metal_light04_norm.tga} (100%) rename textures/exomorphx/light/{metal_light04_red_reflect.tga => metal_light04_reflect.tga} (100%) rename textures/exomorphx/wall/{metal_panel01_rust.tga => metal_panel02rust.tga} (100%) rename textures/exomorphx/wall/{metal_panel01_rust_gloss.tga => metal_panel02rust_gloss.tga} (100%) rename textures/exomorphx/wall/{metal_panel01_rust_norm.tga => metal_panel02rust_norm.tga} (100%) rename textures/exomorphx/wall/{metal_panel01_rust_reflect.tga => metal_panel02rust_reflect.tga} (100%) rename textures/exomorphx/{panel => wall}/metal_wall03.tga (100%) rename textures/exomorphx/{panel => wall}/metal_wall03_gloss.tga (100%) rename textures/exomorphx/{panel => wall}/metal_wall03_norm.tga (100%) rename textures/exomorphx/{panel => wall}/metal_wall03_reflect.tga (100%) rename textures/exomorphx/{panel => wall}/metal_wall04.tga (100%) rename textures/exomorphx/{panel => wall}/metal_wall04_gloss.tga (100%) rename textures/exomorphx/{panel => wall}/metal_wall04_norm.tga (100%) rename textures/exomorphx/{panel => wall}/metal_wall04_reflect.tga (100%) 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_red.tga b/textures/exomorphx/light/metal_light04.tga similarity index 100% rename from textures/exomorphx/light/metal_light04_red.tga rename to textures/exomorphx/light/metal_light04.tga diff --git a/textures/exomorphx/light/metal_light04_red_gloss.tga b/textures/exomorphx/light/metal_light04_gloss.tga similarity index 100% rename from textures/exomorphx/light/metal_light04_red_gloss.tga rename to textures/exomorphx/light/metal_light04_gloss.tga diff --git a/textures/exomorphx/light/metal_light04_red_glow.tga b/textures/exomorphx/light/metal_light04_glow.tga similarity index 100% rename from textures/exomorphx/light/metal_light04_red_glow.tga rename to textures/exomorphx/light/metal_light04_glow.tga diff --git a/textures/exomorphx/light/metal_light04_red_norm.tga b/textures/exomorphx/light/metal_light04_norm.tga similarity index 100% rename from textures/exomorphx/light/metal_light04_red_norm.tga rename to textures/exomorphx/light/metal_light04_norm.tga diff --git a/textures/exomorphx/light/metal_light04_red_reflect.tga b/textures/exomorphx/light/metal_light04_reflect.tga similarity index 100% rename from textures/exomorphx/light/metal_light04_red_reflect.tga rename to textures/exomorphx/light/metal_light04_reflect.tga diff --git a/textures/exomorphx/wall/metal_panel01_rust.tga b/textures/exomorphx/wall/metal_panel02rust.tga similarity index 100% rename from textures/exomorphx/wall/metal_panel01_rust.tga rename to textures/exomorphx/wall/metal_panel02rust.tga diff --git a/textures/exomorphx/wall/metal_panel01_rust_gloss.tga b/textures/exomorphx/wall/metal_panel02rust_gloss.tga similarity index 100% rename from textures/exomorphx/wall/metal_panel01_rust_gloss.tga rename to textures/exomorphx/wall/metal_panel02rust_gloss.tga diff --git a/textures/exomorphx/wall/metal_panel01_rust_norm.tga b/textures/exomorphx/wall/metal_panel02rust_norm.tga similarity index 100% rename from textures/exomorphx/wall/metal_panel01_rust_norm.tga rename to textures/exomorphx/wall/metal_panel02rust_norm.tga diff --git a/textures/exomorphx/wall/metal_panel01_rust_reflect.tga b/textures/exomorphx/wall/metal_panel02rust_reflect.tga similarity index 100% rename from textures/exomorphx/wall/metal_panel01_rust_reflect.tga rename to textures/exomorphx/wall/metal_panel02rust_reflect.tga diff --git a/textures/exomorphx/panel/metal_wall03.tga b/textures/exomorphx/wall/metal_wall03.tga similarity index 100% rename from textures/exomorphx/panel/metal_wall03.tga rename to textures/exomorphx/wall/metal_wall03.tga diff --git a/textures/exomorphx/panel/metal_wall03_gloss.tga b/textures/exomorphx/wall/metal_wall03_gloss.tga similarity index 100% rename from textures/exomorphx/panel/metal_wall03_gloss.tga rename to textures/exomorphx/wall/metal_wall03_gloss.tga diff --git a/textures/exomorphx/panel/metal_wall03_norm.tga b/textures/exomorphx/wall/metal_wall03_norm.tga similarity index 100% rename from textures/exomorphx/panel/metal_wall03_norm.tga rename to textures/exomorphx/wall/metal_wall03_norm.tga diff --git a/textures/exomorphx/panel/metal_wall03_reflect.tga b/textures/exomorphx/wall/metal_wall03_reflect.tga similarity index 100% rename from textures/exomorphx/panel/metal_wall03_reflect.tga rename to textures/exomorphx/wall/metal_wall03_reflect.tga diff --git a/textures/exomorphx/panel/metal_wall04.tga b/textures/exomorphx/wall/metal_wall04.tga similarity index 100% rename from textures/exomorphx/panel/metal_wall04.tga rename to textures/exomorphx/wall/metal_wall04.tga diff --git a/textures/exomorphx/panel/metal_wall04_gloss.tga b/textures/exomorphx/wall/metal_wall04_gloss.tga similarity index 100% rename from textures/exomorphx/panel/metal_wall04_gloss.tga rename to textures/exomorphx/wall/metal_wall04_gloss.tga diff --git a/textures/exomorphx/panel/metal_wall04_norm.tga b/textures/exomorphx/wall/metal_wall04_norm.tga similarity index 100% rename from textures/exomorphx/panel/metal_wall04_norm.tga rename to textures/exomorphx/wall/metal_wall04_norm.tga diff --git a/textures/exomorphx/panel/metal_wall04_reflect.tga b/textures/exomorphx/wall/metal_wall04_reflect.tga similarity index 100% rename from textures/exomorphx/panel/metal_wall04_reflect.tga rename to textures/exomorphx/wall/metal_wall04_reflect.tga -- 2.39.2