From: maddin <mjschwan@gmx.de>
Date: Fri, 1 Nov 2013 16:07:49 +0000 (+0100)
Subject: new panel texture, updated wall textures and shader
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fheads%2Fmaddin%2Ftextures-cleax;p=xonotic%2Fxonotic-maps.pk3dir.git

new panel texture, updated wall textures and shader
---

diff --git a/scripts/cleax.shader b/scripts/cleax.shader
index 7d8b3a72..80269467 100644
--- 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
index 00000000..8f4540a3
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
index 00000000..c1dedf60
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
index 00000000..54cd49b9
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 d8613ba8..b3b7fb0b 100644
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
index 00000000..afdd4d15
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
index 00000000..c36bebad
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
index 00000000..6bde8511
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 2e9d6685..c36bebad 100644
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 0deec568..6bde8511 100644
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
index 00000000..15526dac
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
index 00000000..c36bebad
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
index 00000000..6bde8511
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 24b74d98..38d7098f 100644
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 2e9d6685..a0a36fcf 100644
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 0deec568..f1e62b04 100644
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
index 081cd84c..00000000
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
index 2e9d6685..00000000
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
index 0deec568..00000000
Binary files a/textures/cleax/wall/wall3_norm.tga and /dev/null differ