Merge branch 'master' into divVerent/archived/fruitiex/textures

diff --git a/scripts/exx.shader b/scripts/exx.shader
index 035a9bd032c405bc44051f9fca27105600f00af3..5fe332aa16708a59f7da987d754e849ff6611842 100644 (file)
--- a/scripts/exx.shader
+++ b/scripts/exx.shader
@@ -709,6 +709,75 @@ textures/exx/floor-wrn01
        }
 }
 
+textures/exx/floor-wrn01-blue
+{
+       qer_editorimage textures/exx/floor/floor_wrn01-blue.tga
+       
+       q3map_bounceScale  0.75
+       dpoffsetmapping - 2
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+
+
+       {
+               map textures/exx/floor/floor_wrn01-blue.tga
+               
+
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+
+textures/exx/floor-wrn01-red
+{
+       qer_editorimage textures/exx/floor/floor_wrn01-red.tga
+       
+       q3map_bounceScale  0.75
+       dpoffsetmapping - 2
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+
+
+       {
+               map textures/exx/floor/floor_wrn01-red.tga
+               
+
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+
+textures/exx/floor-wrn01-purple
+{
+       qer_editorimage textures/exx/floor/floor_wrn01-purple.tga
+       
+       q3map_bounceScale  0.75
+       dpoffsetmapping - 2
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+
+
+       {
+               map textures/exx/floor/floor_wrn01-purple.tga
+               
+
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+
 textures/exx/light-panel01
 {
        qer_editorimage textures/exx/light/light_panel01.tga
@@ -797,6 +866,35 @@ textures/exx/light-u201-surfacelight
                blendfunc filter
        }
 }
+textures/exx/panel-grate01
+{
+       qer_editorimage textures/exx/panel/panel_grate01.tga
+       
+       surfaceparm metalsteps
+       q3map_bounceScale  2
+       dpoffsetmapping - 2
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+
+       surfaceparm nomarks
+       surfaceparm trans
+       surfaceparm alphashadow
+
+       cull none
+       nopicmip
+       nomipmaps
+       {
+               map textures/exx/panel/panel_grate01.tga
+               alphaFunc GT0
+               rgbgen vertex
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
 textures/exx/panel-metal01
 {
        qer_editorimage textures/exx/panel/panel_metal01.tga

diff --git a/scripts/trak5x.shader b/scripts/trak5x.shader
index e12c9592dc042f100a4bf1eb11b39f21905aa221..32396f2f9ba470fe389cffb8afd4f55ec6c411c0 100644 (file)
--- a/scripts/trak5x.shader
+++ b/scripts/trak5x.shader
@@ -161,6 +161,25 @@ textures/trak5x/base-pipe1d
                map textures/trak5x/base/base_pipe1d.tga
                
 
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/trak5x/base-pipe1e
+{
+       qer_editorimage textures/trak5x/base/base_pipe1e.tga
+       
+       q3map_bounceScale 1.25
+
+
+       {
+               map textures/trak5x/base/base_pipe1e.tga
+               
+
        }
        {
                map $lightmap

diff --git a/textures/exx/floor/floor_wrn01-blue.tga b/textures/exx/floor/floor_wrn01-blue.tga
new file mode 100644 (file)
index 0000000..f7df1d8
Binary files /dev/null and b/textures/exx/floor/floor_wrn01-blue.tga differ

diff --git a/textures/exx/floor/floor_wrn01-blue_gloss.tga b/textures/exx/floor/floor_wrn01-blue_gloss.tga
new file mode 100644 (file)
index 0000000..13b83d8
Binary files /dev/null and b/textures/exx/floor/floor_wrn01-blue_gloss.tga differ

diff --git a/textures/exx/floor/floor_wrn01-blue_norm.tga b/textures/exx/floor/floor_wrn01-blue_norm.tga
new file mode 100644 (file)
index 0000000..144a981
Binary files /dev/null and b/textures/exx/floor/floor_wrn01-blue_norm.tga differ

diff --git a/textures/exx/floor/floor_wrn01-purple.tga b/textures/exx/floor/floor_wrn01-purple.tga
new file mode 100644 (file)
index 0000000..f448712
Binary files /dev/null and b/textures/exx/floor/floor_wrn01-purple.tga differ

diff --git a/textures/exx/floor/floor_wrn01-purple_gloss.tga b/textures/exx/floor/floor_wrn01-purple_gloss.tga
new file mode 100644 (file)
index 0000000..13b83d8
Binary files /dev/null and b/textures/exx/floor/floor_wrn01-purple_gloss.tga differ

diff --git a/textures/exx/floor/floor_wrn01-purple_norm.tga b/textures/exx/floor/floor_wrn01-purple_norm.tga
new file mode 100644 (file)
index 0000000..144a981
Binary files /dev/null and b/textures/exx/floor/floor_wrn01-purple_norm.tga differ

diff --git a/textures/exx/floor/floor_wrn01-red.tga b/textures/exx/floor/floor_wrn01-red.tga
new file mode 100644 (file)
index 0000000..09e2082
Binary files /dev/null and b/textures/exx/floor/floor_wrn01-red.tga differ

diff --git a/textures/exx/floor/floor_wrn01-red_gloss.tga b/textures/exx/floor/floor_wrn01-red_gloss.tga
new file mode 100644 (file)
index 0000000..13b83d8
Binary files /dev/null and b/textures/exx/floor/floor_wrn01-red_gloss.tga differ

diff --git a/textures/exx/floor/floor_wrn01-red_norm.tga b/textures/exx/floor/floor_wrn01-red_norm.tga
new file mode 100644 (file)
index 0000000..144a981
Binary files /dev/null and b/textures/exx/floor/floor_wrn01-red_norm.tga differ

diff --git a/textures/exx/panel/panel_grate01.tga b/textures/exx/panel/panel_grate01.tga
new file mode 100644 (file)
index 0000000..5abf61f
Binary files /dev/null and b/textures/exx/panel/panel_grate01.tga differ

diff --git a/textures/exx/panel/panel_grate01_gloss.tga b/textures/exx/panel/panel_grate01_gloss.tga
new file mode 100644 (file)
index 0000000..093328c
Binary files /dev/null and b/textures/exx/panel/panel_grate01_gloss.tga differ

diff --git a/textures/procedural/floor01.tga b/textures/procedural/floor01.tga
new file mode 100644 (file)
index 0000000..ed84485
Binary files /dev/null and b/textures/procedural/floor01.tga differ

diff --git a/textures/procedural/floor01_gloss.tga b/textures/procedural/floor01_gloss.tga
new file mode 100644 (file)
index 0000000..798ea57
Binary files /dev/null and b/textures/procedural/floor01_gloss.tga differ

diff --git a/textures/procedural/floor01_norm.tga b/textures/procedural/floor01_norm.tga
new file mode 100644 (file)
index 0000000..09e9bd4
Binary files /dev/null and b/textures/procedural/floor01_norm.tga differ

diff --git a/textures/procedural/floor02.tga b/textures/procedural/floor02.tga
new file mode 100644 (file)
index 0000000..9a51863
Binary files /dev/null and b/textures/procedural/floor02.tga differ

diff --git a/textures/procedural/floor02_gloss.tga b/textures/procedural/floor02_gloss.tga
new file mode 100644 (file)
index 0000000..74cc179
Binary files /dev/null and b/textures/procedural/floor02_gloss.tga differ

diff --git a/textures/procedural/floor02_norm.tga b/textures/procedural/floor02_norm.tga
new file mode 100644 (file)
index 0000000..13e856c
Binary files /dev/null and b/textures/procedural/floor02_norm.tga differ

diff --git a/textures/procedural/floor03.tga b/textures/procedural/floor03.tga
new file mode 100644 (file)
index 0000000..b0d4d85
Binary files /dev/null and b/textures/procedural/floor03.tga differ

diff --git a/textures/procedural/floor03_gloss.tga b/textures/procedural/floor03_gloss.tga
new file mode 100644 (file)
index 0000000..79d694c
Binary files /dev/null and b/textures/procedural/floor03_gloss.tga differ

diff --git a/textures/procedural/floor03_norm.tga b/textures/procedural/floor03_norm.tga
new file mode 100644 (file)
index 0000000..450c175
Binary files /dev/null and b/textures/procedural/floor03_norm.tga differ

diff --git a/textures/procedural/floor04.tga b/textures/procedural/floor04.tga
new file mode 100644 (file)
index 0000000..71ce980
Binary files /dev/null and b/textures/procedural/floor04.tga differ

diff --git a/textures/procedural/floor04_gloss.tga b/textures/procedural/floor04_gloss.tga
new file mode 100644 (file)
index 0000000..d4b4f56
Binary files /dev/null and b/textures/procedural/floor04_gloss.tga differ

diff --git a/textures/procedural/floor04_norm.tga b/textures/procedural/floor04_norm.tga
new file mode 100644 (file)
index 0000000..db7045c
Binary files /dev/null and b/textures/procedural/floor04_norm.tga differ

diff --git a/textures/procedural/fruitconcrete.tga b/textures/procedural/fruitconcrete.tga
new file mode 100644 (file)
index 0000000..85b0f74
Binary files /dev/null and b/textures/procedural/fruitconcrete.tga differ

diff --git a/textures/procedural/fruitconcrete_blue.tga b/textures/procedural/fruitconcrete_blue.tga
new file mode 100644 (file)
index 0000000..2ba42f3
Binary files /dev/null and b/textures/procedural/fruitconcrete_blue.tga differ

diff --git a/textures/procedural/fruitconcrete_blue_gloss.tga b/textures/procedural/fruitconcrete_blue_gloss.tga
new file mode 100644 (file)
index 0000000..6bc8ab6
Binary files /dev/null and b/textures/procedural/fruitconcrete_blue_gloss.tga differ

diff --git a/textures/procedural/fruitconcrete_blue_norm.tga b/textures/procedural/fruitconcrete_blue_norm.tga
new file mode 100644 (file)
index 0000000..0d1c2bd
Binary files /dev/null and b/textures/procedural/fruitconcrete_blue_norm.tga differ

diff --git a/textures/procedural/fruitconcrete_gloss.tga b/textures/procedural/fruitconcrete_gloss.tga
new file mode 100644 (file)
index 0000000..6bc8ab6
Binary files /dev/null and b/textures/procedural/fruitconcrete_gloss.tga differ

diff --git a/textures/procedural/fruitconcrete_norm.tga b/textures/procedural/fruitconcrete_norm.tga
new file mode 100644 (file)
index 0000000..0d1c2bd
Binary files /dev/null and b/textures/procedural/fruitconcrete_norm.tga differ

diff --git a/textures/procedural/fruitconcrete_purple.tga b/textures/procedural/fruitconcrete_purple.tga
new file mode 100644 (file)
index 0000000..e6e1ff9
Binary files /dev/null and b/textures/procedural/fruitconcrete_purple.tga differ

diff --git a/textures/procedural/fruitconcrete_purple_gloss.tga b/textures/procedural/fruitconcrete_purple_gloss.tga
new file mode 100644 (file)
index 0000000..6bc8ab6
Binary files /dev/null and b/textures/procedural/fruitconcrete_purple_gloss.tga differ

diff --git a/textures/procedural/fruitconcrete_purple_norm.tga b/textures/procedural/fruitconcrete_purple_norm.tga
new file mode 100644 (file)
index 0000000..0d1c2bd
Binary files /dev/null and b/textures/procedural/fruitconcrete_purple_norm.tga differ

diff --git a/textures/procedural/fruitconcrete_red.tga b/textures/procedural/fruitconcrete_red.tga
new file mode 100644 (file)
index 0000000..75b416a
Binary files /dev/null and b/textures/procedural/fruitconcrete_red.tga differ

diff --git a/textures/procedural/fruitconcrete_red_gloss.tga b/textures/procedural/fruitconcrete_red_gloss.tga
new file mode 100644 (file)
index 0000000..6bc8ab6
Binary files /dev/null and b/textures/procedural/fruitconcrete_red_gloss.tga differ

diff --git a/textures/procedural/fruitconcrete_red_norm.tga b/textures/procedural/fruitconcrete_red_norm.tga
new file mode 100644 (file)
index 0000000..0d1c2bd
Binary files /dev/null and b/textures/procedural/fruitconcrete_red_norm.tga differ

diff --git a/textures/trak5x/base/base_pipe1e.tga b/textures/trak5x/base/base_pipe1e.tga
new file mode 100644 (file)
index 0000000..9b379e0
Binary files /dev/null and b/textures/trak5x/base/base_pipe1e.tga differ

diff --git a/textures/trak5x/base/base_pipe1e_gloss.tga b/textures/trak5x/base/base_pipe1e_gloss.tga
new file mode 100644 (file)
index 0000000..54dae95
Binary files /dev/null and b/textures/trak5x/base/base_pipe1e_gloss.tga differ

diff --git a/textures/trak5x/base/base_pipe1e_norm.tga b/textures/trak5x/base/base_pipe1e_norm.tga
new file mode 100644 (file)
index 0000000..223091e
Binary files /dev/null and b/textures/trak5x/base/base_pipe1e_norm.tga differ