Merge remote branch 'origin/master' into diabolik/techpanel

diff --git a/scripts/shaderlist.txt b/scripts/shaderlist.txt
index 31cc7ec1d97788462ea5c6eae3280935129c2319..d735750083a0276fce430690b21185d704ebf022 100644 (file)
--- a/scripts/shaderlist.txt
+++ b/scripts/shaderlist.txt
@@ -8,3 +8,4 @@ facility114x
 trak4x
 trak5x
 terrain01x
+techpanelx

diff --git a/scripts/techpanelx.shader b/scripts/techpanelx.shader
new file mode 100644 (file)
index 0000000..71714e5
--- /dev/null
+++ b/scripts/techpanelx.shader
@@ -0,0 +1,297 @@
+textures/techpanelx/base-diamondplate
+{
+       qer_editorimage textures/techpanelx/base/base_diamondplate.png
+       
+       q3map_bounceScale 0.5
+       dpoffsetmapping - 2
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+
+       {
+               map textures/techpanelx/base/base_diamondplate.png
+               
+
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/techpanelx/floor-panel1
+{
+       qer_editorimage textures/techpanelx/floor/floor_panel1.png
+       
+       q3map_bounceScale 0.5
+       dpoffsetmapping - 2
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+
+
+       {
+               map textures/techpanelx/floor/floor_panel1.png
+               
+
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/techpanelx/floor-panel2
+{
+       qer_editorimage textures/techpanelx/floor/floor_panel2.png
+       
+       q3map_bounceScale 0.5
+       dpoffsetmapping - 2
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+
+       {
+               map textures/techpanelx/floor/floor_panel2.png
+               
+
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/techpanelx/panel-techcrate
+{
+       qer_editorimage textures/techpanelx/panel/panel_techcrate.png
+       
+       q3map_bounceScale 0.5
+       dpoffsetmapping - 2
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+
+       {
+               map textures/techpanelx/panel/panel_techcrate.png
+               
+
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/techpanelx/panel-tech1b
+{
+       qer_editorimage textures/techpanelx/panel/panel_tech1b.png
+       
+       q3map_bounceScale 0.5
+       dpoffsetmapping - 2
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+
+       {
+               map textures/techpanelx/panel/panel_tech1b.png
+               
+
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/techpanelx/panel-tech1r
+{
+       qer_editorimage textures/techpanelx/panel/panel_tech1r.png
+       
+       q3map_bounceScale 0.5
+       dpoffsetmapping - 2
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+
+       {
+               map textures/techpanelx/panel/panel_tech1r.png
+               
+
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/techpanelx/panel-tech2r
+{
+       qer_editorimage textures/techpanelx/panel/panel_tech2r.png
+       
+       q3map_bounceScale 0.5
+       dpoffsetmapping - 2
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+
+       {
+               map textures/techpanelx/panel/panel_tech2r.png
+               
+
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/techpanelx/panel-tech2b
+{
+       qer_editorimage textures/techpanelx/panel/panel_tech2b.png
+       
+       q3map_bounceScale 0.5
+       dpoffsetmapping - 2
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+
+       {
+               map textures/techpanelx/panel/panel_tech2b.png
+               
+
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/techpanelx/panel_tech3
+{
+       qer_editorimage textures/techpanelx/panel/panel_tech3.png
+       
+       q3map_bounceScale 0.5
+       dpoffsetmapping - 2
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+
+       {
+               map textures/techpanelx/panel/panel_tech3.png
+               
+
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/techpanelx/panel-tech4
+{
+       qer_editorimage textures/techpanelx/panel/panel_tech4.png
+       
+       q3map_bounceScale 0.5
+       dpoffsetmapping - 2
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+
+       {
+               map textures/techpanelx/panel/panel_tech4.png
+               
+
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/techpanelx/trim-section1b
+{
+       qer_editorimage textures/techpanelx/trim/trim_section1b.png
+       
+       q3map_bounceScale 0.5
+       dpoffsetmapping - 2
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+
+       {
+               map textures/techpanelx/trim/trim_section1b.png
+               
+
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/techpanelx/trim-section1r
+{
+       qer_editorimage textures/techpanelx/trim/trim_section1r.png
+       
+       q3map_bounceScale 0.5
+       dpoffsetmapping - 2
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+
+       {
+               map textures/techpanelx/trim/trim_section1r.png
+               
+
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/techpanelx/wall-section2r
+{
+       qer_editorimage textures/techpanelx/wall/wall_section2r.png
+       
+       q3map_bounceScale 0.5
+       dpoffsetmapping - 2
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+
+
+       {
+               map textures/techpanelx/wall/wall_section2r.png
+               
+
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/techpanelx/wall-section3
+{
+       qer_editorimage textures/techpanelx/wall/wall_section3.png
+       
+       q3map_bounceScale 0.5
+       dpoffsetmapping - 2
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+
+
+       {
+               map textures/techpanelx/wall/wall_section3.png
+               
+
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}

diff --git a/textures/techpanelx/base/base_diamondplate.png b/textures/techpanelx/base/base_diamondplate.png
new file mode 100755 (executable)
index 0000000..411aaa7
Binary files /dev/null and b/textures/techpanelx/base/base_diamondplate.png differ

diff --git a/textures/techpanelx/base/base_diamondplate_gloss.png b/textures/techpanelx/base/base_diamondplate_gloss.png
new file mode 100644 (file)
index 0000000..9ac0535
Binary files /dev/null and b/textures/techpanelx/base/base_diamondplate_gloss.png differ

diff --git a/textures/techpanelx/base/base_diamondplate_norm.png b/textures/techpanelx/base/base_diamondplate_norm.png
new file mode 100755 (executable)
index 0000000..c8f216c
Binary files /dev/null and b/textures/techpanelx/base/base_diamondplate_norm.png differ

diff --git a/textures/techpanelx/floor/floor_panel1.png b/textures/techpanelx/floor/floor_panel1.png
new file mode 100755 (executable)
index 0000000..0e7f637
Binary files /dev/null and b/textures/techpanelx/floor/floor_panel1.png differ

diff --git a/textures/techpanelx/floor/floor_panel1_gloss.png b/textures/techpanelx/floor/floor_panel1_gloss.png
new file mode 100644 (file)
index 0000000..99e81c8
Binary files /dev/null and b/textures/techpanelx/floor/floor_panel1_gloss.png differ

diff --git a/textures/techpanelx/floor/floor_panel1_norm.png b/textures/techpanelx/floor/floor_panel1_norm.png
new file mode 100755 (executable)
index 0000000..8dab6d1
Binary files /dev/null and b/textures/techpanelx/floor/floor_panel1_norm.png differ

diff --git a/textures/techpanelx/floor/floor_panel2.png b/textures/techpanelx/floor/floor_panel2.png
new file mode 100755 (executable)
index 0000000..c566005
Binary files /dev/null and b/textures/techpanelx/floor/floor_panel2.png differ

diff --git a/textures/techpanelx/floor/floor_panel2_gloss.png b/textures/techpanelx/floor/floor_panel2_gloss.png
new file mode 100644 (file)
index 0000000..889607f
Binary files /dev/null and b/textures/techpanelx/floor/floor_panel2_gloss.png differ

diff --git a/textures/techpanelx/floor/floor_panel2_norm.png b/textures/techpanelx/floor/floor_panel2_norm.png
new file mode 100755 (executable)
index 0000000..33b6334
Binary files /dev/null and b/textures/techpanelx/floor/floor_panel2_norm.png differ

diff --git a/textures/techpanelx/panel/panel_tech1b.png b/textures/techpanelx/panel/panel_tech1b.png
new file mode 100644 (file)
index 0000000..9fdfd18
Binary files /dev/null and b/textures/techpanelx/panel/panel_tech1b.png differ

diff --git a/textures/techpanelx/panel/panel_tech1b_gloss.png b/textures/techpanelx/panel/panel_tech1b_gloss.png
new file mode 100644 (file)
index 0000000..a5e102a
Binary files /dev/null and b/textures/techpanelx/panel/panel_tech1b_gloss.png differ

diff --git a/textures/techpanelx/panel/panel_tech1b_norm.png b/textures/techpanelx/panel/panel_tech1b_norm.png
new file mode 100755 (executable)
index 0000000..51533a0
Binary files /dev/null and b/textures/techpanelx/panel/panel_tech1b_norm.png differ

diff --git a/textures/techpanelx/panel/panel_tech1r.png b/textures/techpanelx/panel/panel_tech1r.png
new file mode 100755 (executable)
index 0000000..6810a52
Binary files /dev/null and b/textures/techpanelx/panel/panel_tech1r.png differ

diff --git a/textures/techpanelx/panel/panel_tech1r_gloss.png b/textures/techpanelx/panel/panel_tech1r_gloss.png
new file mode 100644 (file)
index 0000000..c9e63d2
Binary files /dev/null and b/textures/techpanelx/panel/panel_tech1r_gloss.png differ

diff --git a/textures/techpanelx/panel/panel_tech1r_norm.png b/textures/techpanelx/panel/panel_tech1r_norm.png
new file mode 100755 (executable)
index 0000000..51533a0
Binary files /dev/null and b/textures/techpanelx/panel/panel_tech1r_norm.png differ

diff --git a/textures/techpanelx/panel/panel_tech2b.png b/textures/techpanelx/panel/panel_tech2b.png
new file mode 100644 (file)
index 0000000..e7eafd2
Binary files /dev/null and b/textures/techpanelx/panel/panel_tech2b.png differ

diff --git a/textures/techpanelx/panel/panel_tech2b_gloss.png b/textures/techpanelx/panel/panel_tech2b_gloss.png
new file mode 100644 (file)
index 0000000..172b1cb
Binary files /dev/null and b/textures/techpanelx/panel/panel_tech2b_gloss.png differ

diff --git a/textures/techpanelx/panel/panel_tech2b_norm.png b/textures/techpanelx/panel/panel_tech2b_norm.png
new file mode 100755 (executable)
index 0000000..5a86ee2
Binary files /dev/null and b/textures/techpanelx/panel/panel_tech2b_norm.png differ

diff --git a/textures/techpanelx/panel/panel_tech2r.png b/textures/techpanelx/panel/panel_tech2r.png
new file mode 100755 (executable)
index 0000000..846a221
Binary files /dev/null and b/textures/techpanelx/panel/panel_tech2r.png differ

diff --git a/textures/techpanelx/panel/panel_tech2r_gloss.png b/textures/techpanelx/panel/panel_tech2r_gloss.png
new file mode 100644 (file)
index 0000000..37db328
Binary files /dev/null and b/textures/techpanelx/panel/panel_tech2r_gloss.png differ

diff --git a/textures/techpanelx/panel/panel_tech2r_norm.png b/textures/techpanelx/panel/panel_tech2r_norm.png
new file mode 100755 (executable)
index 0000000..5a86ee2
Binary files /dev/null and b/textures/techpanelx/panel/panel_tech2r_norm.png differ

diff --git a/textures/techpanelx/panel/panel_tech3.png b/textures/techpanelx/panel/panel_tech3.png
new file mode 100755 (executable)
index 0000000..0eb2559
Binary files /dev/null and b/textures/techpanelx/panel/panel_tech3.png differ

diff --git a/textures/techpanelx/panel/panel_tech3_gloss.png b/textures/techpanelx/panel/panel_tech3_gloss.png
new file mode 100644 (file)
index 0000000..ca2e708
Binary files /dev/null and b/textures/techpanelx/panel/panel_tech3_gloss.png differ

diff --git a/textures/techpanelx/panel/panel_tech3_norm.png b/textures/techpanelx/panel/panel_tech3_norm.png
new file mode 100755 (executable)
index 0000000..c0a1d02
Binary files /dev/null and b/textures/techpanelx/panel/panel_tech3_norm.png differ

diff --git a/textures/techpanelx/panel/panel_tech4.png b/textures/techpanelx/panel/panel_tech4.png
new file mode 100755 (executable)
index 0000000..9996202
Binary files /dev/null and b/textures/techpanelx/panel/panel_tech4.png differ

diff --git a/textures/techpanelx/panel/panel_tech4_gloss.png b/textures/techpanelx/panel/panel_tech4_gloss.png
new file mode 100644 (file)
index 0000000..a6904c6
Binary files /dev/null and b/textures/techpanelx/panel/panel_tech4_gloss.png differ

diff --git a/textures/techpanelx/panel/panel_tech4_norm.png b/textures/techpanelx/panel/panel_tech4_norm.png
new file mode 100755 (executable)
index 0000000..b2d4877
Binary files /dev/null and b/textures/techpanelx/panel/panel_tech4_norm.png differ

diff --git a/textures/techpanelx/panel/panel_techcrate.png b/textures/techpanelx/panel/panel_techcrate.png
new file mode 100755 (executable)
index 0000000..5ce4af6
Binary files /dev/null and b/textures/techpanelx/panel/panel_techcrate.png differ

diff --git a/textures/techpanelx/panel/panel_techcrate_gloss.png b/textures/techpanelx/panel/panel_techcrate_gloss.png
new file mode 100644 (file)
index 0000000..b8b0aa7
Binary files /dev/null and b/textures/techpanelx/panel/panel_techcrate_gloss.png differ

diff --git a/textures/techpanelx/panel/panel_techcrate_norm.png b/textures/techpanelx/panel/panel_techcrate_norm.png
new file mode 100755 (executable)
index 0000000..899c618
Binary files /dev/null and b/textures/techpanelx/panel/panel_techcrate_norm.png differ

diff --git a/textures/techpanelx/trim/trim_section1b.png b/textures/techpanelx/trim/trim_section1b.png
new file mode 100644 (file)
index 0000000..d149d96
Binary files /dev/null and b/textures/techpanelx/trim/trim_section1b.png differ

diff --git a/textures/techpanelx/trim/trim_section1b_gloss.png b/textures/techpanelx/trim/trim_section1b_gloss.png
new file mode 100644 (file)
index 0000000..c8c4e6e
Binary files /dev/null and b/textures/techpanelx/trim/trim_section1b_gloss.png differ

diff --git a/textures/techpanelx/trim/trim_section1b_norm.png b/textures/techpanelx/trim/trim_section1b_norm.png
new file mode 100755 (executable)
index 0000000..bf7509b
Binary files /dev/null and b/textures/techpanelx/trim/trim_section1b_norm.png differ

diff --git a/textures/techpanelx/trim/trim_section1r.png b/textures/techpanelx/trim/trim_section1r.png
new file mode 100755 (executable)
index 0000000..9c95f27
Binary files /dev/null and b/textures/techpanelx/trim/trim_section1r.png differ

diff --git a/textures/techpanelx/trim/trim_section1r_gloss.png b/textures/techpanelx/trim/trim_section1r_gloss.png
new file mode 100644 (file)
index 0000000..ba17838
Binary files /dev/null and b/textures/techpanelx/trim/trim_section1r_gloss.png differ

diff --git a/textures/techpanelx/trim/trim_section1r_norm.png b/textures/techpanelx/trim/trim_section1r_norm.png
new file mode 100755 (executable)
index 0000000..bf7509b
Binary files /dev/null and b/textures/techpanelx/trim/trim_section1r_norm.png differ

diff --git a/textures/techpanelx/wall/wall_section2r.png b/textures/techpanelx/wall/wall_section2r.png
new file mode 100755 (executable)
index 0000000..77d33ec
Binary files /dev/null and b/textures/techpanelx/wall/wall_section2r.png differ

diff --git a/textures/techpanelx/wall/wall_section2r_gloss.png b/textures/techpanelx/wall/wall_section2r_gloss.png
new file mode 100644 (file)
index 0000000..0b28756
Binary files /dev/null and b/textures/techpanelx/wall/wall_section2r_gloss.png differ

diff --git a/textures/techpanelx/wall/wall_section2r_norm.png b/textures/techpanelx/wall/wall_section2r_norm.png
new file mode 100755 (executable)
index 0000000..b7478c5
Binary files /dev/null and b/textures/techpanelx/wall/wall_section2r_norm.png differ

diff --git a/textures/techpanelx/wall/wall_section3.png b/textures/techpanelx/wall/wall_section3.png
new file mode 100755 (executable)
index 0000000..a925ab7
Binary files /dev/null and b/textures/techpanelx/wall/wall_section3.png differ

diff --git a/textures/techpanelx/wall/wall_section3_gloss.png b/textures/techpanelx/wall/wall_section3_gloss.png
new file mode 100644 (file)
index 0000000..88259aa
Binary files /dev/null and b/textures/techpanelx/wall/wall_section3_gloss.png differ

diff --git a/textures/techpanelx/wall/wall_section3_norm.png b/textures/techpanelx/wall/wall_section3_norm.png
new file mode 100755 (executable)
index 0000000..d538e29
Binary files /dev/null and b/textures/techpanelx/wall/wall_section3_norm.png differ