Merge remote branch 'origin/divVerent/fruitiex-textures' into fruitiex/runningmanctf

diff --git a/scripts/proceduralx.shader b/scripts/proceduralx.shader
new file mode 100644 (file)
index 0000000..39aac0c
--- /dev/null
+++ b/scripts/proceduralx.shader
@@ -0,0 +1,194 @@
+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
+       dpreflectcube cubemaps/default/sky
+
+
+       {
+               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
+       dpreflectcube cubemaps/default/sky
+
+
+       {
+               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
+       dpreflectcube cubemaps/default/sky
+
+
+       {
+               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
+       dpreflectcube cubemaps/default/sky
+
+
+       {
+               map textures/proceduralx/floor/floor03
+                               
+       }
+
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+
+
+textures/proceduralx/floor-floor05
+{
+       qer_editorimage textures/proceduralx/floor/floor05
+       dpoffsetmapping - 1
+       q3map_bouncescale 1.25
+       dpreflectcube cubemaps/default/sky
+
+
+       {
+               map textures/proceduralx/floor/floor05
+                               
+       }
+
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+
+

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --git a/textures/proceduralx/floor/floor01.tga b/textures/proceduralx/floor/floor01.tga
new file mode 100644 (file)
index 0000000..2f76f2f
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..4e578e2
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..b757770
Binary files /dev/null and b/textures/proceduralx/floor/floor01_norm.tga differ

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

diff --git a/textures/proceduralx/floor/floor02.tga b/textures/proceduralx/floor/floor02.tga
new file mode 100644 (file)
index 0000000..567c838
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..0d5fe31
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..493bb9b
Binary files /dev/null and b/textures/proceduralx/floor/floor02_norm.tga differ

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

diff --git a/textures/proceduralx/floor/floor03.tga b/textures/proceduralx/floor/floor03.tga
new file mode 100644 (file)
index 0000000..51c3401
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..fe52c4f
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..d670fa7
Binary files /dev/null and b/textures/proceduralx/floor/floor03_norm.tga differ

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

diff --git a/textures/proceduralx/floor/floor04.tga b/textures/proceduralx/floor/floor04.tga
new file mode 100644 (file)
index 0000000..7bbfed5
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..e8ef1c3
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..888e05c
Binary files /dev/null and b/textures/proceduralx/floor/floor04_norm.tga differ

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

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

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

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

diff --git a/textures/proceduralx/floor/floor05_reflect.tga b/textures/proceduralx/floor/floor05_reflect.tga
new file mode 100644 (file)
index 0000000..aec7e2b
Binary files /dev/null and b/textures/proceduralx/floor/floor05_reflect.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