Merge branch 'master' into divVerent/fruitiex-textures

diff --git a/scripts/proceduralx.shader b/scripts/proceduralx.shader
new file mode 100644 (file)
index 0000000..96fbd1a
--- /dev/null
+++ b/scripts/proceduralx.shader
@@ -0,0 +1,168 @@
+textures/proceduralx/wall-fruitconcrete_red
+{
+       qer_editorimage textures/proceduralx/wall/fruitconcrete_red
+       dpoffsetmapping - 0.5
+       q3map_bouncescale 1.25
+
+
+       {
+               map textures/proceduralx/wall/fruitconcrete_red
+                               
+       }
+
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+
+
+textures/proceduralx/wall-fruitconcrete_purple
+{
+       qer_editorimage textures/proceduralx/wall/fruitconcrete_purple
+       dpoffsetmapping - 0.5
+       q3map_bouncescale 1.25
+
+
+       {
+               map textures/proceduralx/wall/fruitconcrete_purple
+                               
+       }
+
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+
+
+textures/proceduralx/wall-fruitconcrete
+{
+       qer_editorimage textures/proceduralx/wall/fruitconcrete
+       dpoffsetmapping - 0.5
+       q3map_bouncescale 1.25
+
+
+       {
+               map textures/proceduralx/wall/fruitconcrete
+                               
+       }
+
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+
+
+textures/proceduralx/wall-fruitconcrete_blue
+{
+       qer_editorimage textures/proceduralx/wall/fruitconcrete_blue
+       dpoffsetmapping - 0.5
+       q3map_bouncescale 1.25
+
+
+       {
+               map textures/proceduralx/wall/fruitconcrete_blue
+                               
+       }
+
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+
+
+textures/proceduralx/floor-floor02
+{
+       qer_editorimage textures/proceduralx/floor/floor02
+       dpoffsetmapping - 1
+       q3map_bouncescale 1.25
+
+
+       {
+               map textures/proceduralx/floor/floor02
+                               
+       }
+
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+
+
+textures/proceduralx/floor-floor01
+{
+       qer_editorimage textures/proceduralx/floor/floor01
+       dpoffsetmapping - 1
+       q3map_bouncescale 1.25
+
+
+       {
+               map textures/proceduralx/floor/floor01
+                               
+       }
+
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+
+
+textures/proceduralx/floor-floor04
+{
+       qer_editorimage textures/proceduralx/floor/floor04
+       dpoffsetmapping - 1
+       q3map_bouncescale 1.25
+
+
+       {
+               map textures/proceduralx/floor/floor04
+                               
+       }
+
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+
+
+textures/proceduralx/floor-floor03
+{
+       qer_editorimage textures/proceduralx/floor/floor03
+       dpoffsetmapping - 1
+       q3map_bouncescale 1.25
+
+
+       {
+               map textures/proceduralx/floor/floor03
+                               
+       }
+
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+
+

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --git a/textures/proceduralx/wall/fruitconcrete_blue_norm.tga b/textures/proceduralx/wall/fruitconcrete_blue_norm.tga
new file mode 100644 (file)
index 0000000..25d8fc1
Binary files /dev/null and b/textures/proceduralx/wall/fruitconcrete_blue_norm.tga differ

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

diff --git a/textures/proceduralx/wall/fruitconcrete_norm.tga b/textures/proceduralx/wall/fruitconcrete_norm.tga
new file mode 100644 (file)
index 0000000..25d8fc1
Binary files /dev/null and b/textures/proceduralx/wall/fruitconcrete_norm.tga differ

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

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

diff --git a/textures/proceduralx/wall/fruitconcrete_purple_norm.tga b/textures/proceduralx/wall/fruitconcrete_purple_norm.tga
new file mode 100644 (file)
index 0000000..25d8fc1
Binary files /dev/null and b/textures/proceduralx/wall/fruitconcrete_purple_norm.tga differ

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

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

diff --git a/textures/proceduralx/wall/fruitconcrete_red_norm.tga b/textures/proceduralx/wall/fruitconcrete_red_norm.tga
new file mode 100644 (file)
index 0000000..25d8fc1
Binary files /dev/null and b/textures/proceduralx/wall/fruitconcrete_red_norm.tga differ