new panel texture, updated wall textures and shader

diff --git a/scripts/cleax.shader b/scripts/cleax.shader
index 7d8b3a72098acefb8655f5108205c6de15c937fc..80269467529e1308a028686ec9d4f6dad5409e04 100644 (file)
--- a/scripts/cleax.shader
+++ b/scripts/cleax.shader
@@ -388,6 +388,23 @@ textures/cleax/panel6
        }
 }
 
+textures/cleax/panel7
+{
+       qer_editorimage textures/cleax/panel/panel7
+       dpoffsetmapping - 1 match8 128
+       dpglossintensitymod 4
+       dpglossexponentmod 4
+       surfaceparm metalsteps
+       q3map_bouncescale 1.5
+       {
+               map textures/cleax/panel/panel7
+       }
+       {
+               map $lightmap
+               blendfunc filter
+       }
+}
+
 // TRIM
 
 textures/cleax/trim1
@@ -497,7 +514,7 @@ textures/cleax/trim6
 textures/cleax/wall1
 {
        qer_editorimage textures/cleax/wall/wall1
-       dpoffsetmapping - 1 match8 47
+       dpoffsetmapping - 1 match8 28
        dpglossintensitymod 4
        dpglossexponentmod 4
        surfaceparm metalsteps
@@ -511,16 +528,16 @@ textures/cleax/wall1
        }
 }
 
-textures/cleax/wall2
+textures/cleax/wall1_red
 {
-       qer_editorimage textures/cleax/wall/wall2
-       dpoffsetmapping - 1 match8 47
+       qer_editorimage textures/cleax/wall/wall1_red
+       dpoffsetmapping - 1 match8 28
        dpglossintensitymod 4
        dpglossexponentmod 4
        surfaceparm metalsteps
        q3map_bouncescale 1.5
        {
-               map textures/cleax/wall/wall2
+               map textures/cleax/wall/wall1_red
        }
        {
                map $lightmap
@@ -528,16 +545,33 @@ textures/cleax/wall2
        }
 }
 
-textures/cleax/wall3
+textures/cleax/wall1_blue
 {
-       qer_editorimage textures/cleax/wall/wall3
-       dpoffsetmapping - 1 match8 47
+       qer_editorimage textures/cleax/wall/wall1_blue
+       dpoffsetmapping - 1 match8 28
        dpglossintensitymod 4
        dpglossexponentmod 4
        surfaceparm metalsteps
        q3map_bouncescale 1.5
        {
-               map textures/cleax/wall/wall3
+               map textures/cleax/wall/wall1_blue
+       }
+       {
+               map $lightmap
+               blendfunc filter
+       }
+}
+
+textures/cleax/wall2
+{
+       qer_editorimage textures/cleax/wall/wall2
+       dpoffsetmapping - 1 match8 22
+       dpglossintensitymod 4
+       dpglossexponentmod 4
+       surfaceparm metalsteps
+       q3map_bouncescale 1.5
+       {
+               map textures/cleax/wall/wall2
        }
        {
                map $lightmap

diff --git a/textures/cleax/panel/panel7.tga b/textures/cleax/panel/panel7.tga
new file mode 100644 (file)
index 0000000..8f4540a
Binary files /dev/null and b/textures/cleax/panel/panel7.tga differ

diff --git a/textures/cleax/panel/panel7_gloss.tga b/textures/cleax/panel/panel7_gloss.tga
new file mode 100644 (file)
index 0000000..c1dedf6
Binary files /dev/null and b/textures/cleax/panel/panel7_gloss.tga differ

diff --git a/textures/cleax/panel/panel7_norm.tga b/textures/cleax/panel/panel7_norm.tga
new file mode 100644 (file)
index 0000000..54cd49b
Binary files /dev/null and b/textures/cleax/panel/panel7_norm.tga differ

diff --git a/textures/cleax/wall/wall1.tga b/textures/cleax/wall/wall1.tga
index d8613ba8b86b2bea5de12fd52285a95f5799e1a2..b3b7fb0bcf82cd2d5d7c3f3c136d419cab0b1eca 100644 (file)
Binary files a/textures/cleax/wall/wall1.tga and b/textures/cleax/wall/wall1.tga differ

diff --git a/textures/cleax/wall/wall1_blue.tga b/textures/cleax/wall/wall1_blue.tga
new file mode 100644 (file)
index 0000000..afdd4d1
Binary files /dev/null and b/textures/cleax/wall/wall1_blue.tga differ

diff --git a/textures/cleax/wall/wall1_blue_gloss.tga b/textures/cleax/wall/wall1_blue_gloss.tga
new file mode 100644 (file)
index 0000000..c36beba
Binary files /dev/null and b/textures/cleax/wall/wall1_blue_gloss.tga differ

diff --git a/textures/cleax/wall/wall1_blue_norm.tga b/textures/cleax/wall/wall1_blue_norm.tga
new file mode 100644 (file)
index 0000000..6bde851
Binary files /dev/null and b/textures/cleax/wall/wall1_blue_norm.tga differ

diff --git a/textures/cleax/wall/wall1_gloss.tga b/textures/cleax/wall/wall1_gloss.tga
index 2e9d6685659d5edd314ce2a5bfde6d039f409338..c36bebadae7957a29f865aa4dbd63c0f9e3dac23 100644 (file)
Binary files a/textures/cleax/wall/wall1_gloss.tga and b/textures/cleax/wall/wall1_gloss.tga differ

diff --git a/textures/cleax/wall/wall1_norm.tga b/textures/cleax/wall/wall1_norm.tga
index 0deec56861e692b5daacba07d3319a37cb6c5248..6bde85115a5e0f516102e4c8b372083a93664ead 100644 (file)
Binary files a/textures/cleax/wall/wall1_norm.tga and b/textures/cleax/wall/wall1_norm.tga differ

diff --git a/textures/cleax/wall/wall1_red.tga b/textures/cleax/wall/wall1_red.tga
new file mode 100644 (file)
index 0000000..15526da
Binary files /dev/null and b/textures/cleax/wall/wall1_red.tga differ

diff --git a/textures/cleax/wall/wall1_red_gloss.tga b/textures/cleax/wall/wall1_red_gloss.tga
new file mode 100644 (file)
index 0000000..c36beba
Binary files /dev/null and b/textures/cleax/wall/wall1_red_gloss.tga differ

diff --git a/textures/cleax/wall/wall1_red_norm.tga b/textures/cleax/wall/wall1_red_norm.tga
new file mode 100644 (file)
index 0000000..6bde851
Binary files /dev/null and b/textures/cleax/wall/wall1_red_norm.tga differ

diff --git a/textures/cleax/wall/wall2.tga b/textures/cleax/wall/wall2.tga
index 24b74d983dd9580af7b8bdfcc9abb8ae4d2d9d91..38d7098ff60e15065dcbc0c9e27cc59c8f6be912 100644 (file)
Binary files a/textures/cleax/wall/wall2.tga and b/textures/cleax/wall/wall2.tga differ

diff --git a/textures/cleax/wall/wall2_gloss.tga b/textures/cleax/wall/wall2_gloss.tga
index 2e9d6685659d5edd314ce2a5bfde6d039f409338..a0a36fcf64d13f033c0595972e614a84d7510efd 100644 (file)
Binary files a/textures/cleax/wall/wall2_gloss.tga and b/textures/cleax/wall/wall2_gloss.tga differ

diff --git a/textures/cleax/wall/wall2_norm.tga b/textures/cleax/wall/wall2_norm.tga
index 0deec56861e692b5daacba07d3319a37cb6c5248..f1e62b0473554397eabf48e7eba2c8e03ed2fddd 100644 (file)
Binary files a/textures/cleax/wall/wall2_norm.tga and b/textures/cleax/wall/wall2_norm.tga differ

diff --git a/textures/cleax/wall/wall3.tga b/textures/cleax/wall/wall3.tga
deleted file mode 100644 (file)
index 081cd84..0000000
Binary files a/textures/cleax/wall/wall3.tga and /dev/null differ

diff --git a/textures/cleax/wall/wall3_gloss.tga b/textures/cleax/wall/wall3_gloss.tga
deleted file mode 100644 (file)
index 2e9d668..0000000
Binary files a/textures/cleax/wall/wall3_gloss.tga and /dev/null differ

diff --git a/textures/cleax/wall/wall3_norm.tga b/textures/cleax/wall/wall3_norm.tga
deleted file mode 100644 (file)
index 0deec56..0000000
Binary files a/textures/cleax/wall/wall3_norm.tga and /dev/null differ