From: Rudolf Polzer <divverent@alientrap.org>
Date: Fri, 20 Aug 2010 16:14:34 +0000 (+0200)
Subject: Squashed commit of the following:
X-Git-Tag: xonotic-v0.1.0preview~151^2~38
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6de90e8e1aa8beadabc03ce349a3cb4cbeef999c;p=xonotic%2Fxonotic-maps.pk3dir.git

Squashed commit of the following:

commit 321d3a6e9b5fb405850e613fe1d30cc15f287b08
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Fri Aug 20 18:00:51 2010 +0200

    yet another attempt at fixing normals. Parameters: heightsource=1 filter=3 scale=0.4

commit 739ce7735f5715fecf997e9ec1ee47e7789a3af1
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Fri Aug 20 07:56:32 2010 +0200

    another attempt

commit f2a8032b8c86aede59656996f9d6965c566b04ff
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Fri Aug 20 07:47:00 2010 +0200

    redid normalmaps with different settings (3x3 Prewitt, 30% scale)

commit 68ddcb38722c31375c50c095accb5868cbaa2ab4
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Fri Aug 20 07:09:20 2010 +0200

    replace bump by norm maps

commit c41ed619474526d44c794fa908bab6dd89d25c84
Merge: 821968e 10c8dae
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Fri Aug 20 06:18:50 2010 +0200

    Merge branch 'master' into diabolik/eX2x

commit 821968edf839a5f4bf266e1da9ea963823295ca0
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Fri Aug 20 06:16:37 2010 +0200

    add base-yellowpaint too

commit 0f3e661c96f9b9ec1d3605758c304b1dc2f970c0
Merge: dc0855e a2e171d
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Fri Aug 20 06:15:11 2010 +0200

    Merge branch 'master' into diabolik/eX2x

commit dc0855e24c2cd03e2ea568717e163e4ae5f18183
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Fri Aug 20 06:13:48 2010 +0200

    make ex2x/base-chainlink actually transparent

commit 212718e02d0d77801424410a2fac664fbadca1c7
Author: Sahil Singhal <sahil@sahil-desktop.(none)>
Date:   Fri Aug 20 00:10:38 2010 -0400

    Remove chainlink_alfa.

commit 15fec8069700a9101416f49d522cbd6956ea3083
Author: Sahil Singhal <sahil@sahil-desktop.(none)>
Date:   Thu Aug 19 17:42:55 2010 -0400

    ex2x by Kay. New texture set. Hopefully organized correctly.
---

diff --git a/scripts/ex2x.shader b/scripts/ex2x.shader
new file mode 100644
index 00000000..22cdf7f6
--- /dev/null
+++ b/scripts/ex2x.shader
@@ -0,0 +1,685 @@
+textures/ex2x/base-yellowpaint
+{
+	qer_editorimage textures/ex2x/base/base_yellowpaint.tga
+	
+	q3map_bounceScale  0.5
+	dpoffsetmapping - 2
+	dpglossintensitymod  3
+	dpglossexponentmod  4
+
+
+	{
+		map textures/ex2x/base/base_yellowpaint.tga
+		
+
+	}
+	{
+		map $lightmap
+		rgbGen identity
+		tcGen lightmap
+		blendfunc filter
+	}
+}
+textures/ex2x/base-bluepaint
+{
+	qer_editorimage textures/ex2x/base/base_bluepaint.tga
+	
+	q3map_bounceScale  0.5
+	dpoffsetmapping - 2
+	dpglossintensitymod  3
+	dpglossexponentmod  4
+
+
+	{
+		map textures/ex2x/base/base_bluepaint.tga
+		
+
+	}
+	{
+		map $lightmap
+		rgbGen identity
+		tcGen lightmap
+		blendfunc filter
+	}
+}
+textures/ex2x/base-chainlink
+{
+	qer_editorimage textures/ex2x/base/base_chainlink.tga
+	
+	q3map_bounceScale  0.5
+	dpoffsetmapping - 2
+	dpglossintensitymod  3
+	dpglossexponentmod  4
+
+	surfaceparm trans
+	cull none
+
+	{
+		map textures/ex2x/base/base_chainlink.tga
+		alphafunc GE128
+	}
+	{
+		map $lightmap
+		rgbGen identity
+		tcGen lightmap
+		blendfunc filter
+	}
+}
+textures/ex2x/base-metal1
+{
+	qer_editorimage textures/ex2x/base/base_metal1.tga
+	
+	q3map_bounceScale  0.5
+	dpoffsetmapping - 2
+	dpglossintensitymod  3
+	dpglossexponentmod  4
+
+
+	{
+		map textures/ex2x/base/base_metal1.tga
+		
+
+	}
+	{
+		map $lightmap
+		rgbGen identity
+		tcGen lightmap
+		blendfunc filter
+	}
+}
+textures/ex2x/base-metal2
+{
+	qer_editorimage textures/ex2x/base/base_metal2.tga
+	
+	q3map_bounceScale  0.5
+	dpoffsetmapping - 2
+	dpglossintensitymod  3
+	dpglossexponentmod  4
+
+
+	{
+		map textures/ex2x/base/base_metal2.tga
+		
+
+	}
+	{
+		map $lightmap
+		rgbGen identity
+		tcGen lightmap
+		blendfunc filter
+	}
+}
+textures/ex2x/base-metal3
+{
+	qer_editorimage textures/ex2x/base/base_metal3.tga
+	
+	q3map_bounceScale  0.5
+	dpoffsetmapping - 2
+	dpglossintensitymod  3
+	dpglossexponentmod  4
+
+
+	{
+		map textures/ex2x/base/base_metal3.tga
+		
+
+	}
+	{
+		map $lightmap
+		rgbGen identity
+		tcGen lightmap
+		blendfunc filter
+	}
+}
+textures/ex2x/base-metal4
+{
+	qer_editorimage textures/ex2x/base/base_metal4.tga
+	
+	q3map_bounceScale  0.5
+	dpoffsetmapping - 2
+	dpglossintensitymod  3
+	dpglossexponentmod  4
+
+
+	{
+		map textures/ex2x/base/base_metal4.tga
+		
+
+	}
+	{
+		map $lightmap
+		rgbGen identity
+		tcGen lightmap
+		blendfunc filter
+	}
+}
+textures/ex2x/base-metalmaterial1
+{
+	qer_editorimage textures/ex2x/base/base_metalmaterial1.tga
+	
+	q3map_bounceScale  0.5
+	dpoffsetmapping - 2
+	dpglossintensitymod  3
+	dpglossexponentmod  4
+
+
+	{
+		map textures/ex2x/base/base_metalmaterial1.tga
+		
+
+	}
+	{
+		map $lightmap
+		rgbGen identity
+		tcGen lightmap
+		blendfunc filter
+	}
+}
+textures/ex2x/base-stone_metal
+{
+	qer_editorimage textures/ex2x/base/base_stone_metal.tga
+	
+	q3map_bounceScale  0.5
+	dpoffsetmapping - 2
+	dpglossintensitymod  3
+	dpglossexponentmod  4
+
+
+	{
+		map textures/ex2x/base/base_stone_metal.tga
+		
+
+	}
+	{
+		map $lightmap
+		rgbGen identity
+		tcGen lightmap
+		blendfunc filter
+	}
+}
+textures/ex2x/floor-1
+{
+	qer_editorimage textures/ex2x/floor/floor_1.tga
+	
+	q3map_bounceScale  0.5
+	dpoffsetmapping - 2
+	dpglossintensitymod  3
+	dpglossexponentmod  4
+
+
+	{
+		map textures/ex2x/floor/floor_1.tga
+		
+
+	}
+	{
+		map $lightmap
+		rgbGen identity
+		tcGen lightmap
+		blendfunc filter
+	}
+}
+textures/ex2x/floor-h1
+{
+	qer_editorimage textures/ex2x/floor/floor_h1.tga
+	
+	q3map_bounceScale  0.5
+	dpoffsetmapping - 2
+	dpglossintensitymod  3
+	dpglossexponentmod  4
+
+
+	{
+		map textures/ex2x/floor/floor_h1.tga
+		
+
+	}
+	{
+		map $lightmap
+		rgbGen identity
+		tcGen lightmap
+		blendfunc filter
+	}
+}
+textures/ex2x/floor-h2
+{
+	qer_editorimage textures/ex2x/floor/floor_h2.tga
+	
+	q3map_bounceScale  0.5
+	dpoffsetmapping - 2
+	dpglossintensitymod  3
+	dpglossexponentmod  4
+
+
+	{
+		map textures/ex2x/floor/floor_h2.tga
+		
+
+	}
+	{
+		map $lightmap
+		rgbGen identity
+		tcGen lightmap
+		blendfunc filter
+	}
+}
+textures/ex2x/floor-h3
+{
+	qer_editorimage textures/ex2x/floor/floor_h3.tga
+	
+	q3map_bounceScale  0.5
+	dpoffsetmapping - 2
+	dpglossintensitymod  3
+	dpglossexponentmod  4
+
+
+	{
+		map textures/ex2x/floor/floor_h3.tga
+		
+
+	}
+	{
+		map $lightmap
+		rgbGen identity
+		tcGen lightmap
+		blendfunc filter
+	}
+}
+textures/ex2x/floor-h4
+{
+	qer_editorimage textures/ex2x/floor/floor_h4.tga
+	
+	q3map_bounceScale  0.5
+	dpoffsetmapping - 2
+	dpglossintensitymod  3
+	dpglossexponentmod  4
+
+
+	{
+		map textures/ex2x/floor/floor_h4.tga
+		
+
+	}
+	{
+		map $lightmap
+		rgbGen identity
+		tcGen lightmap
+		blendfunc filter
+	}
+}
+textures/ex2x/floor-metal1
+{
+	qer_editorimage textures/ex2x/floor/floor_metal1.tga
+	
+	q3map_bounceScale  0.5
+	dpoffsetmapping - 2
+	dpglossintensitymod  3
+	dpglossexponentmod  4
+
+
+	{
+		map textures/ex2x/floor/floor_metal1.tga
+		
+
+	}
+	{
+		map $lightmap
+		rgbGen identity
+		tcGen lightmap
+		blendfunc filter
+	}
+}
+textures/ex2x/floor-metal2
+{
+	qer_editorimage textures/ex2x/floor/floor_metal2.tga
+	
+	q3map_bounceScale  0.5
+	dpoffsetmapping - 2
+	dpglossintensitymod  3
+	dpglossexponentmod  4
+
+
+	{
+		map textures/ex2x/floor/floor_metal2.tga
+		
+
+	}
+	{
+		map $lightmap
+		rgbGen identity
+		tcGen lightmap
+		blendfunc filter
+	}
+}
+textures/ex2x/floor-metal3
+{
+	qer_editorimage textures/ex2x/floor/floor_metal3.tga
+	
+	q3map_bounceScale  0.5
+	dpoffsetmapping - 2
+	dpglossintensitymod  3
+	dpglossexponentmod  4
+
+
+	{
+		map textures/ex2x/floor/floor_metal3.tga
+		
+
+	}
+	{
+		map $lightmap
+		rgbGen identity
+		tcGen lightmap
+		blendfunc filter
+	}
+}
+textures/ex2x/floor-p1
+{
+	qer_editorimage textures/ex2x/floor/floor_p1.tga
+	
+	q3map_bounceScale  0.5
+	dpoffsetmapping - 2
+	dpglossintensitymod  3
+	dpglossexponentmod  4
+
+
+	{
+		map textures/ex2x/floor/floor_p1.tga
+		
+
+	}
+	{
+		map $lightmap
+		rgbGen identity
+		tcGen lightmap
+		blendfunc filter
+	}
+}
+textures/ex2x/floor-plate1
+{
+	qer_editorimage textures/ex2x/floor/floor_plate1.tga
+	
+	q3map_bounceScale  0.5
+	dpoffsetmapping - 2
+	dpglossintensitymod  3
+	dpglossexponentmod  4
+
+
+	{
+		map textures/ex2x/floor/floor_plate1.tga
+		
+
+	}
+	{
+		map $lightmap
+		rgbGen identity
+		tcGen lightmap
+		blendfunc filter
+	}
+}
+textures/ex2x/floor-plate2
+{
+	qer_editorimage textures/ex2x/floor/floor_plate2.tga
+	
+	q3map_bounceScale  0.5
+	dpoffsetmapping - 2
+	dpglossintensitymod  3
+	dpglossexponentmod  4
+
+
+	{
+		map textures/ex2x/floor/floor_plate2.tga
+		
+
+	}
+	{
+		map $lightmap
+		rgbGen identity
+		tcGen lightmap
+		blendfunc filter
+	}
+}
+textures/ex2x/floor-r1
+{
+	qer_editorimage textures/ex2x/floor/floor_r1.tga
+	
+	q3map_bounceScale  0.5
+	dpoffsetmapping - 2
+	dpglossintensitymod  3
+	dpglossexponentmod  4
+
+
+	{
+		map textures/ex2x/floor/floor_r1.tga
+		
+
+	}
+	{
+		map $lightmap
+		rgbGen identity
+		tcGen lightmap
+		blendfunc filter
+	}
+}
+textures/ex2x/floor-rust1
+{
+	qer_editorimage textures/ex2x/floor/floor_rust1.tga
+	
+	q3map_bounceScale  0.5
+	dpoffsetmapping - 2
+	dpglossintensitymod  3
+	dpglossexponentmod  4
+
+
+	{
+		map textures/ex2x/floor/floor_rust1.tga
+		
+
+	}
+	{
+		map $lightmap
+		rgbGen identity
+		tcGen lightmap
+		blendfunc filter
+	}
+}
+textures/ex2x/light-1
+{
+	qer_editorimage textures/ex2x/light/light_1.tga
+	
+	q3map_bounceScale  0.75
+	dpoffsetmapping - 2
+	dpglossintensitymod  3
+	dpglossexponentmod  4
+
+
+	{
+		map textures/ex2x/light/light_1.tga
+		
+
+	}
+	{
+		map $lightmap
+		rgbGen identity
+		tcGen lightmap
+		blendfunc filter
+	}
+}
+textures/ex2x/light-2
+{
+	qer_editorimage textures/ex2x/light/light_2.tga
+	
+	q3map_bounceScale  0.75
+	dpoffsetmapping - 2
+	dpglossintensitymod  3
+	dpglossexponentmod  4
+
+
+	{
+		map textures/ex2x/light/light_2.tga
+		
+
+	}
+	{
+		map $lightmap
+		rgbGen identity
+		tcGen lightmap
+		blendfunc filter
+	}
+}
+textures/ex2x/light-beam_blue
+{
+	qer_editorimage textures/ex2x/light/light_beam_blue.tga
+	
+	q3map_bounceScale  0.75
+	dpoffsetmapping - 2
+	dpglossintensitymod  3
+	dpglossexponentmod  4
+
+
+	{
+		map textures/ex2x/light/light_beam_blue.tga
+		
+
+	}
+	{
+		map $lightmap
+		rgbGen identity
+		tcGen lightmap
+		blendfunc filter
+	}
+}
+textures/ex2x/light-beam_red
+{
+	qer_editorimage textures/ex2x/light/light_beam_red.tga
+	
+	q3map_bounceScale  0.75
+	dpoffsetmapping - 2
+	dpglossintensitymod  3
+	dpglossexponentmod  4
+
+
+	{
+		map textures/ex2x/light/light_beam_red.tga
+		
+
+	}
+	{
+		map $lightmap
+		rgbGen identity
+		tcGen lightmap
+		blendfunc filter
+	}
+}
+textures/ex2x/trim-green2
+{
+	qer_editorimage textures/ex2x/trim/trim_green2.tga
+	
+	surfaceparm metalsteps
+	q3map_bounceScale  1.5
+	dpoffsetmapping - 2
+	dpglossintensitymod  3
+	dpglossexponentmod  4
+
+
+	{
+		map textures/ex2x/trim/trim_green2.tga
+		
+
+	}
+	{
+		map $lightmap
+		rgbGen identity
+		tcGen lightmap
+		blendfunc filter
+	}
+}
+textures/ex2x/trim-warn1
+{
+	qer_editorimage textures/ex2x/trim/trim_warn1.tga
+	
+	surfaceparm metalsteps
+	q3map_bounceScale  1.5
+	dpoffsetmapping - 2
+	dpglossintensitymod  3
+	dpglossexponentmod  4
+
+
+	{
+		map textures/ex2x/trim/trim_warn1.tga
+		
+
+	}
+	{
+		map $lightmap
+		rgbGen identity
+		tcGen lightmap
+		blendfunc filter
+	}
+}
+textures/ex2x/wall-green1
+{
+	qer_editorimage textures/ex2x/wall/wall_green1.tga
+	
+	q3map_bounceScale  0.5
+	dpoffsetmapping - 2
+	dpglossintensitymod  3
+	dpglossexponentmod  4
+
+
+	{
+		map textures/ex2x/wall/wall_green1.tga
+		
+
+	}
+	{
+		map $lightmap
+		rgbGen identity
+		tcGen lightmap
+		blendfunc filter
+	}
+}
+textures/ex2x/wall-green1dirt
+{
+	qer_editorimage textures/ex2x/wall/wall_green1dirt.tga
+	
+	q3map_bounceScale  0.5
+	dpoffsetmapping - 2
+	dpglossintensitymod  3
+	dpglossexponentmod  4
+
+
+	{
+		map textures/ex2x/wall/wall_green1dirt.tga
+		
+
+	}
+	{
+		map $lightmap
+		rgbGen identity
+		tcGen lightmap
+		blendfunc filter
+	}
+}
+textures/ex2x/wall-purple1
+{
+	qer_editorimage textures/ex2x/wall/wall_purple1.tga
+	
+	q3map_bounceScale  0.5
+	dpoffsetmapping - 2
+	dpglossintensitymod  3
+	dpglossexponentmod  4
+
+
+	{
+		map textures/ex2x/wall/wall_purple1.tga
+		
+
+	}
+	{
+		map $lightmap
+		rgbGen identity
+		tcGen lightmap
+		blendfunc filter
+	}
+}
diff --git a/scripts/shaderlist.txt b/scripts/shaderlist.txt
index 09413e46..31cc7ec1 100644
--- a/scripts/shaderlist.txt
+++ b/scripts/shaderlist.txt
@@ -3,6 +3,7 @@ decals
 exosystem
 extragalactic
 exx
+ex2x
 facility114x
 trak4x
 trak5x
diff --git a/textures/ex2x/base/base_bluepaint.tga b/textures/ex2x/base/base_bluepaint.tga
new file mode 100644
index 00000000..93237d6a
Binary files /dev/null and b/textures/ex2x/base/base_bluepaint.tga differ
diff --git a/textures/ex2x/base/base_bluepaint_gloss.tga b/textures/ex2x/base/base_bluepaint_gloss.tga
new file mode 100644
index 00000000..205ac450
Binary files /dev/null and b/textures/ex2x/base/base_bluepaint_gloss.tga differ
diff --git a/textures/ex2x/base/base_bluepaint_norm.tga b/textures/ex2x/base/base_bluepaint_norm.tga
new file mode 100644
index 00000000..1327878d
Binary files /dev/null and b/textures/ex2x/base/base_bluepaint_norm.tga differ
diff --git a/textures/ex2x/base/base_chainlink.tga b/textures/ex2x/base/base_chainlink.tga
new file mode 100644
index 00000000..6d51ed3f
Binary files /dev/null and b/textures/ex2x/base/base_chainlink.tga differ
diff --git a/textures/ex2x/base/base_chainlink_gloss.tga b/textures/ex2x/base/base_chainlink_gloss.tga
new file mode 100644
index 00000000..9e33ff8b
Binary files /dev/null and b/textures/ex2x/base/base_chainlink_gloss.tga differ
diff --git a/textures/ex2x/base/base_chainlink_norm.tga b/textures/ex2x/base/base_chainlink_norm.tga
new file mode 100644
index 00000000..ee5d8aef
Binary files /dev/null and b/textures/ex2x/base/base_chainlink_norm.tga differ
diff --git a/textures/ex2x/base/base_metal1.tga b/textures/ex2x/base/base_metal1.tga
new file mode 100644
index 00000000..4e95f8fe
Binary files /dev/null and b/textures/ex2x/base/base_metal1.tga differ
diff --git a/textures/ex2x/base/base_metal1_gloss.tga b/textures/ex2x/base/base_metal1_gloss.tga
new file mode 100644
index 00000000..2dab2f19
Binary files /dev/null and b/textures/ex2x/base/base_metal1_gloss.tga differ
diff --git a/textures/ex2x/base/base_metal1_norm.tga b/textures/ex2x/base/base_metal1_norm.tga
new file mode 100644
index 00000000..589e4543
Binary files /dev/null and b/textures/ex2x/base/base_metal1_norm.tga differ
diff --git a/textures/ex2x/base/base_metal2.tga b/textures/ex2x/base/base_metal2.tga
new file mode 100644
index 00000000..7acbad42
Binary files /dev/null and b/textures/ex2x/base/base_metal2.tga differ
diff --git a/textures/ex2x/base/base_metal2_gloss.tga b/textures/ex2x/base/base_metal2_gloss.tga
new file mode 100644
index 00000000..62d573fe
Binary files /dev/null and b/textures/ex2x/base/base_metal2_gloss.tga differ
diff --git a/textures/ex2x/base/base_metal2_norm.tga b/textures/ex2x/base/base_metal2_norm.tga
new file mode 100644
index 00000000..8e37f9ab
Binary files /dev/null and b/textures/ex2x/base/base_metal2_norm.tga differ
diff --git a/textures/ex2x/base/base_metal3.tga b/textures/ex2x/base/base_metal3.tga
new file mode 100644
index 00000000..e2bea258
Binary files /dev/null and b/textures/ex2x/base/base_metal3.tga differ
diff --git a/textures/ex2x/base/base_metal3_gloss.tga b/textures/ex2x/base/base_metal3_gloss.tga
new file mode 100644
index 00000000..a43a6428
Binary files /dev/null and b/textures/ex2x/base/base_metal3_gloss.tga differ
diff --git a/textures/ex2x/base/base_metal3_norm.tga b/textures/ex2x/base/base_metal3_norm.tga
new file mode 100644
index 00000000..11780e3c
Binary files /dev/null and b/textures/ex2x/base/base_metal3_norm.tga differ
diff --git a/textures/ex2x/base/base_metal4.tga b/textures/ex2x/base/base_metal4.tga
new file mode 100644
index 00000000..7e5ab5e1
Binary files /dev/null and b/textures/ex2x/base/base_metal4.tga differ
diff --git a/textures/ex2x/base/base_metal4_gloss.tga b/textures/ex2x/base/base_metal4_gloss.tga
new file mode 100644
index 00000000..c3becafa
Binary files /dev/null and b/textures/ex2x/base/base_metal4_gloss.tga differ
diff --git a/textures/ex2x/base/base_metal4_norm.tga b/textures/ex2x/base/base_metal4_norm.tga
new file mode 100644
index 00000000..f3f15a2b
Binary files /dev/null and b/textures/ex2x/base/base_metal4_norm.tga differ
diff --git a/textures/ex2x/base/base_metalmaterial1.tga b/textures/ex2x/base/base_metalmaterial1.tga
new file mode 100644
index 00000000..58a3ae16
Binary files /dev/null and b/textures/ex2x/base/base_metalmaterial1.tga differ
diff --git a/textures/ex2x/base/base_metalmaterial1_gloss.tga b/textures/ex2x/base/base_metalmaterial1_gloss.tga
new file mode 100644
index 00000000..819a5272
Binary files /dev/null and b/textures/ex2x/base/base_metalmaterial1_gloss.tga differ
diff --git a/textures/ex2x/base/base_stone_metal.tga b/textures/ex2x/base/base_stone_metal.tga
new file mode 100644
index 00000000..e957c6f7
Binary files /dev/null and b/textures/ex2x/base/base_stone_metal.tga differ
diff --git a/textures/ex2x/base/base_stone_metal_gloss.tga b/textures/ex2x/base/base_stone_metal_gloss.tga
new file mode 100644
index 00000000..baf4f122
Binary files /dev/null and b/textures/ex2x/base/base_stone_metal_gloss.tga differ
diff --git a/textures/ex2x/base/base_stone_metal_norm.tga b/textures/ex2x/base/base_stone_metal_norm.tga
new file mode 100644
index 00000000..6524e1d5
Binary files /dev/null and b/textures/ex2x/base/base_stone_metal_norm.tga differ
diff --git a/textures/ex2x/base/base_yellowpaint.tga b/textures/ex2x/base/base_yellowpaint.tga
new file mode 100644
index 00000000..03f72f88
Binary files /dev/null and b/textures/ex2x/base/base_yellowpaint.tga differ
diff --git a/textures/ex2x/base/base_yellowpaint_gloss.tga b/textures/ex2x/base/base_yellowpaint_gloss.tga
new file mode 100644
index 00000000..238e1e10
Binary files /dev/null and b/textures/ex2x/base/base_yellowpaint_gloss.tga differ
diff --git a/textures/ex2x/base/base_yellowpaint_norm.tga b/textures/ex2x/base/base_yellowpaint_norm.tga
new file mode 100644
index 00000000..387378a8
Binary files /dev/null and b/textures/ex2x/base/base_yellowpaint_norm.tga differ
diff --git a/textures/ex2x/floor/floor_1.tga b/textures/ex2x/floor/floor_1.tga
new file mode 100644
index 00000000..ddc86551
Binary files /dev/null and b/textures/ex2x/floor/floor_1.tga differ
diff --git a/textures/ex2x/floor/floor_1_gloss.tga b/textures/ex2x/floor/floor_1_gloss.tga
new file mode 100644
index 00000000..d65330df
Binary files /dev/null and b/textures/ex2x/floor/floor_1_gloss.tga differ
diff --git a/textures/ex2x/floor/floor_1_norm.tga b/textures/ex2x/floor/floor_1_norm.tga
new file mode 100644
index 00000000..4187af7c
Binary files /dev/null and b/textures/ex2x/floor/floor_1_norm.tga differ
diff --git a/textures/ex2x/floor/floor_h1.tga b/textures/ex2x/floor/floor_h1.tga
new file mode 100644
index 00000000..6eb6cd68
Binary files /dev/null and b/textures/ex2x/floor/floor_h1.tga differ
diff --git a/textures/ex2x/floor/floor_h1_gloss.tga b/textures/ex2x/floor/floor_h1_gloss.tga
new file mode 100644
index 00000000..93299664
Binary files /dev/null and b/textures/ex2x/floor/floor_h1_gloss.tga differ
diff --git a/textures/ex2x/floor/floor_h1_norm.tga b/textures/ex2x/floor/floor_h1_norm.tga
new file mode 100644
index 00000000..155959ee
Binary files /dev/null and b/textures/ex2x/floor/floor_h1_norm.tga differ
diff --git a/textures/ex2x/floor/floor_h2.tga b/textures/ex2x/floor/floor_h2.tga
new file mode 100644
index 00000000..0acb93ec
Binary files /dev/null and b/textures/ex2x/floor/floor_h2.tga differ
diff --git a/textures/ex2x/floor/floor_h2_gloss.tga b/textures/ex2x/floor/floor_h2_gloss.tga
new file mode 100644
index 00000000..9a5908bd
Binary files /dev/null and b/textures/ex2x/floor/floor_h2_gloss.tga differ
diff --git a/textures/ex2x/floor/floor_h2_norm.tga b/textures/ex2x/floor/floor_h2_norm.tga
new file mode 100644
index 00000000..ce7e4e2a
Binary files /dev/null and b/textures/ex2x/floor/floor_h2_norm.tga differ
diff --git a/textures/ex2x/floor/floor_h3.tga b/textures/ex2x/floor/floor_h3.tga
new file mode 100644
index 00000000..6223907e
Binary files /dev/null and b/textures/ex2x/floor/floor_h3.tga differ
diff --git a/textures/ex2x/floor/floor_h3_gloss.tga b/textures/ex2x/floor/floor_h3_gloss.tga
new file mode 100644
index 00000000..51cbd204
Binary files /dev/null and b/textures/ex2x/floor/floor_h3_gloss.tga differ
diff --git a/textures/ex2x/floor/floor_h3_norm.tga b/textures/ex2x/floor/floor_h3_norm.tga
new file mode 100644
index 00000000..e91e1ae4
Binary files /dev/null and b/textures/ex2x/floor/floor_h3_norm.tga differ
diff --git a/textures/ex2x/floor/floor_h4.tga b/textures/ex2x/floor/floor_h4.tga
new file mode 100644
index 00000000..fda0325b
Binary files /dev/null and b/textures/ex2x/floor/floor_h4.tga differ
diff --git a/textures/ex2x/floor/floor_h4_gloss.tga b/textures/ex2x/floor/floor_h4_gloss.tga
new file mode 100644
index 00000000..8ce0b7d1
Binary files /dev/null and b/textures/ex2x/floor/floor_h4_gloss.tga differ
diff --git a/textures/ex2x/floor/floor_h4_norm.tga b/textures/ex2x/floor/floor_h4_norm.tga
new file mode 100644
index 00000000..61d1f33f
Binary files /dev/null and b/textures/ex2x/floor/floor_h4_norm.tga differ
diff --git a/textures/ex2x/floor/floor_metal1.tga b/textures/ex2x/floor/floor_metal1.tga
new file mode 100644
index 00000000..efc01f09
Binary files /dev/null and b/textures/ex2x/floor/floor_metal1.tga differ
diff --git a/textures/ex2x/floor/floor_metal1_gloss.tga b/textures/ex2x/floor/floor_metal1_gloss.tga
new file mode 100644
index 00000000..f3cd3da8
Binary files /dev/null and b/textures/ex2x/floor/floor_metal1_gloss.tga differ
diff --git a/textures/ex2x/floor/floor_metal1_norm.tga b/textures/ex2x/floor/floor_metal1_norm.tga
new file mode 100644
index 00000000..0973a3c9
Binary files /dev/null and b/textures/ex2x/floor/floor_metal1_norm.tga differ
diff --git a/textures/ex2x/floor/floor_metal2.tga b/textures/ex2x/floor/floor_metal2.tga
new file mode 100644
index 00000000..dc10d515
Binary files /dev/null and b/textures/ex2x/floor/floor_metal2.tga differ
diff --git a/textures/ex2x/floor/floor_metal2_gloss.tga b/textures/ex2x/floor/floor_metal2_gloss.tga
new file mode 100644
index 00000000..1147b7b1
Binary files /dev/null and b/textures/ex2x/floor/floor_metal2_gloss.tga differ
diff --git a/textures/ex2x/floor/floor_metal2_norm.tga b/textures/ex2x/floor/floor_metal2_norm.tga
new file mode 100644
index 00000000..2c2c6fd1
Binary files /dev/null and b/textures/ex2x/floor/floor_metal2_norm.tga differ
diff --git a/textures/ex2x/floor/floor_metal3.tga b/textures/ex2x/floor/floor_metal3.tga
new file mode 100644
index 00000000..8a25a85b
Binary files /dev/null and b/textures/ex2x/floor/floor_metal3.tga differ
diff --git a/textures/ex2x/floor/floor_metal3_gloss.tga b/textures/ex2x/floor/floor_metal3_gloss.tga
new file mode 100644
index 00000000..de99a339
Binary files /dev/null and b/textures/ex2x/floor/floor_metal3_gloss.tga differ
diff --git a/textures/ex2x/floor/floor_metal3_glow.tga b/textures/ex2x/floor/floor_metal3_glow.tga
new file mode 100644
index 00000000..c9c06319
Binary files /dev/null and b/textures/ex2x/floor/floor_metal3_glow.tga differ
diff --git a/textures/ex2x/floor/floor_metal3_norm.tga b/textures/ex2x/floor/floor_metal3_norm.tga
new file mode 100644
index 00000000..589e78d6
Binary files /dev/null and b/textures/ex2x/floor/floor_metal3_norm.tga differ
diff --git a/textures/ex2x/floor/floor_p1.tga b/textures/ex2x/floor/floor_p1.tga
new file mode 100644
index 00000000..775be14f
Binary files /dev/null and b/textures/ex2x/floor/floor_p1.tga differ
diff --git a/textures/ex2x/floor/floor_p1_gloss.tga b/textures/ex2x/floor/floor_p1_gloss.tga
new file mode 100644
index 00000000..caf6e511
Binary files /dev/null and b/textures/ex2x/floor/floor_p1_gloss.tga differ
diff --git a/textures/ex2x/floor/floor_p1_norm.tga b/textures/ex2x/floor/floor_p1_norm.tga
new file mode 100644
index 00000000..038e7f8e
Binary files /dev/null and b/textures/ex2x/floor/floor_p1_norm.tga differ
diff --git a/textures/ex2x/floor/floor_plate1.tga b/textures/ex2x/floor/floor_plate1.tga
new file mode 100644
index 00000000..b1aa4aaa
Binary files /dev/null and b/textures/ex2x/floor/floor_plate1.tga differ
diff --git a/textures/ex2x/floor/floor_plate1_gloss.tga b/textures/ex2x/floor/floor_plate1_gloss.tga
new file mode 100644
index 00000000..3e38a0c2
Binary files /dev/null and b/textures/ex2x/floor/floor_plate1_gloss.tga differ
diff --git a/textures/ex2x/floor/floor_plate1_norm.tga b/textures/ex2x/floor/floor_plate1_norm.tga
new file mode 100644
index 00000000..6bc97084
Binary files /dev/null and b/textures/ex2x/floor/floor_plate1_norm.tga differ
diff --git a/textures/ex2x/floor/floor_plate2.tga b/textures/ex2x/floor/floor_plate2.tga
new file mode 100644
index 00000000..642ce96b
Binary files /dev/null and b/textures/ex2x/floor/floor_plate2.tga differ
diff --git a/textures/ex2x/floor/floor_plate2_gloss.tga b/textures/ex2x/floor/floor_plate2_gloss.tga
new file mode 100644
index 00000000..041498c4
Binary files /dev/null and b/textures/ex2x/floor/floor_plate2_gloss.tga differ
diff --git a/textures/ex2x/floor/floor_plate2_norm.tga b/textures/ex2x/floor/floor_plate2_norm.tga
new file mode 100644
index 00000000..add111ec
Binary files /dev/null and b/textures/ex2x/floor/floor_plate2_norm.tga differ
diff --git a/textures/ex2x/floor/floor_r1.tga b/textures/ex2x/floor/floor_r1.tga
new file mode 100644
index 00000000..1d922273
Binary files /dev/null and b/textures/ex2x/floor/floor_r1.tga differ
diff --git a/textures/ex2x/floor/floor_r1_gloss.tga b/textures/ex2x/floor/floor_r1_gloss.tga
new file mode 100644
index 00000000..57b2692e
Binary files /dev/null and b/textures/ex2x/floor/floor_r1_gloss.tga differ
diff --git a/textures/ex2x/floor/floor_r1_norm.tga b/textures/ex2x/floor/floor_r1_norm.tga
new file mode 100644
index 00000000..7ab0a31e
Binary files /dev/null and b/textures/ex2x/floor/floor_r1_norm.tga differ
diff --git a/textures/ex2x/floor/floor_rust1.tga b/textures/ex2x/floor/floor_rust1.tga
new file mode 100644
index 00000000..120cf66b
Binary files /dev/null and b/textures/ex2x/floor/floor_rust1.tga differ
diff --git a/textures/ex2x/floor/floor_rust1_gloss.tga b/textures/ex2x/floor/floor_rust1_gloss.tga
new file mode 100644
index 00000000..777547bf
Binary files /dev/null and b/textures/ex2x/floor/floor_rust1_gloss.tga differ
diff --git a/textures/ex2x/floor/floor_rust1_norm.tga b/textures/ex2x/floor/floor_rust1_norm.tga
new file mode 100644
index 00000000..6ae99c1d
Binary files /dev/null and b/textures/ex2x/floor/floor_rust1_norm.tga differ
diff --git a/textures/ex2x/light/light_1.tga b/textures/ex2x/light/light_1.tga
new file mode 100644
index 00000000..19605270
Binary files /dev/null and b/textures/ex2x/light/light_1.tga differ
diff --git a/textures/ex2x/light/light_1_gloss.tga b/textures/ex2x/light/light_1_gloss.tga
new file mode 100644
index 00000000..dc8636c2
Binary files /dev/null and b/textures/ex2x/light/light_1_gloss.tga differ
diff --git a/textures/ex2x/light/light_1_glow.tga b/textures/ex2x/light/light_1_glow.tga
new file mode 100644
index 00000000..18dede39
Binary files /dev/null and b/textures/ex2x/light/light_1_glow.tga differ
diff --git a/textures/ex2x/light/light_1_norm.tga b/textures/ex2x/light/light_1_norm.tga
new file mode 100644
index 00000000..c3ef0a74
Binary files /dev/null and b/textures/ex2x/light/light_1_norm.tga differ
diff --git a/textures/ex2x/light/light_2.tga b/textures/ex2x/light/light_2.tga
new file mode 100644
index 00000000..41e93795
Binary files /dev/null and b/textures/ex2x/light/light_2.tga differ
diff --git a/textures/ex2x/light/light_2_gloss.tga b/textures/ex2x/light/light_2_gloss.tga
new file mode 100644
index 00000000..df3c4a8f
Binary files /dev/null and b/textures/ex2x/light/light_2_gloss.tga differ
diff --git a/textures/ex2x/light/light_2_glow.tga b/textures/ex2x/light/light_2_glow.tga
new file mode 100644
index 00000000..7cedd91b
Binary files /dev/null and b/textures/ex2x/light/light_2_glow.tga differ
diff --git a/textures/ex2x/light/light_2_norm.tga b/textures/ex2x/light/light_2_norm.tga
new file mode 100644
index 00000000..3b7b1504
Binary files /dev/null and b/textures/ex2x/light/light_2_norm.tga differ
diff --git a/textures/ex2x/light/light_beam_blue.tga b/textures/ex2x/light/light_beam_blue.tga
new file mode 100644
index 00000000..a5fbe6f8
Binary files /dev/null and b/textures/ex2x/light/light_beam_blue.tga differ
diff --git a/textures/ex2x/light/light_beam_blue_gloss.tga b/textures/ex2x/light/light_beam_blue_gloss.tga
new file mode 100644
index 00000000..b5e08cfa
Binary files /dev/null and b/textures/ex2x/light/light_beam_blue_gloss.tga differ
diff --git a/textures/ex2x/light/light_beam_blue_glow.tga b/textures/ex2x/light/light_beam_blue_glow.tga
new file mode 100644
index 00000000..6301e778
Binary files /dev/null and b/textures/ex2x/light/light_beam_blue_glow.tga differ
diff --git a/textures/ex2x/light/light_beam_blue_norm.tga b/textures/ex2x/light/light_beam_blue_norm.tga
new file mode 100644
index 00000000..17e0ad86
Binary files /dev/null and b/textures/ex2x/light/light_beam_blue_norm.tga differ
diff --git a/textures/ex2x/light/light_beam_red.tga b/textures/ex2x/light/light_beam_red.tga
new file mode 100644
index 00000000..0bea57a6
Binary files /dev/null and b/textures/ex2x/light/light_beam_red.tga differ
diff --git a/textures/ex2x/light/light_beam_red_gloss.tga b/textures/ex2x/light/light_beam_red_gloss.tga
new file mode 100644
index 00000000..b5e08cfa
Binary files /dev/null and b/textures/ex2x/light/light_beam_red_gloss.tga differ
diff --git a/textures/ex2x/light/light_beam_red_glow.tga b/textures/ex2x/light/light_beam_red_glow.tga
new file mode 100644
index 00000000..a0c1d1ce
Binary files /dev/null and b/textures/ex2x/light/light_beam_red_glow.tga differ
diff --git a/textures/ex2x/light/light_beam_red_norm.tga b/textures/ex2x/light/light_beam_red_norm.tga
new file mode 100644
index 00000000..17e0ad86
Binary files /dev/null and b/textures/ex2x/light/light_beam_red_norm.tga differ
diff --git a/textures/ex2x/trim/trim_green2.tga b/textures/ex2x/trim/trim_green2.tga
new file mode 100644
index 00000000..f1d33e0f
Binary files /dev/null and b/textures/ex2x/trim/trim_green2.tga differ
diff --git a/textures/ex2x/trim/trim_green2_gloss.tga b/textures/ex2x/trim/trim_green2_gloss.tga
new file mode 100644
index 00000000..a8010f20
Binary files /dev/null and b/textures/ex2x/trim/trim_green2_gloss.tga differ
diff --git a/textures/ex2x/trim/trim_green2_glow.tga b/textures/ex2x/trim/trim_green2_glow.tga
new file mode 100644
index 00000000..6e2e4684
Binary files /dev/null and b/textures/ex2x/trim/trim_green2_glow.tga differ
diff --git a/textures/ex2x/trim/trim_green2_norm.tga b/textures/ex2x/trim/trim_green2_norm.tga
new file mode 100644
index 00000000..39c3b07b
Binary files /dev/null and b/textures/ex2x/trim/trim_green2_norm.tga differ
diff --git a/textures/ex2x/trim/trim_warn1.tga b/textures/ex2x/trim/trim_warn1.tga
new file mode 100644
index 00000000..7e10b863
Binary files /dev/null and b/textures/ex2x/trim/trim_warn1.tga differ
diff --git a/textures/ex2x/trim/trim_warn1_gloss.tga b/textures/ex2x/trim/trim_warn1_gloss.tga
new file mode 100644
index 00000000..9204d281
Binary files /dev/null and b/textures/ex2x/trim/trim_warn1_gloss.tga differ
diff --git a/textures/ex2x/trim/trim_warn1_norm.tga b/textures/ex2x/trim/trim_warn1_norm.tga
new file mode 100644
index 00000000..a6eaabc1
Binary files /dev/null and b/textures/ex2x/trim/trim_warn1_norm.tga differ
diff --git a/textures/ex2x/wall/wall_green1.tga b/textures/ex2x/wall/wall_green1.tga
new file mode 100644
index 00000000..0d1c9d8a
Binary files /dev/null and b/textures/ex2x/wall/wall_green1.tga differ
diff --git a/textures/ex2x/wall/wall_green1_gloss.tga b/textures/ex2x/wall/wall_green1_gloss.tga
new file mode 100644
index 00000000..a74323b4
Binary files /dev/null and b/textures/ex2x/wall/wall_green1_gloss.tga differ
diff --git a/textures/ex2x/wall/wall_green1_norm.tga b/textures/ex2x/wall/wall_green1_norm.tga
new file mode 100644
index 00000000..bf9f1da4
Binary files /dev/null and b/textures/ex2x/wall/wall_green1_norm.tga differ
diff --git a/textures/ex2x/wall/wall_green1dirt.tga b/textures/ex2x/wall/wall_green1dirt.tga
new file mode 100644
index 00000000..ab0df41f
Binary files /dev/null and b/textures/ex2x/wall/wall_green1dirt.tga differ
diff --git a/textures/ex2x/wall/wall_green1dirt_gloss.tga b/textures/ex2x/wall/wall_green1dirt_gloss.tga
new file mode 100644
index 00000000..a74323b4
Binary files /dev/null and b/textures/ex2x/wall/wall_green1dirt_gloss.tga differ
diff --git a/textures/ex2x/wall/wall_green1dirt_norm.tga b/textures/ex2x/wall/wall_green1dirt_norm.tga
new file mode 100644
index 00000000..694ba6ec
Binary files /dev/null and b/textures/ex2x/wall/wall_green1dirt_norm.tga differ
diff --git a/textures/ex2x/wall/wall_purple1.tga b/textures/ex2x/wall/wall_purple1.tga
new file mode 100644
index 00000000..e927490d
Binary files /dev/null and b/textures/ex2x/wall/wall_purple1.tga differ
diff --git a/textures/ex2x/wall/wall_purple1_gloss.tga b/textures/ex2x/wall/wall_purple1_gloss.tga
new file mode 100644
index 00000000..37e13a39
Binary files /dev/null and b/textures/ex2x/wall/wall_purple1_gloss.tga differ
diff --git a/textures/ex2x/wall/wall_purple1_norm.tga b/textures/ex2x/wall/wall_purple1_norm.tga
new file mode 100644
index 00000000..ac7c276d
Binary files /dev/null and b/textures/ex2x/wall/wall_purple1_norm.tga differ