Merge branch 'savagex/g-23-relight' of ssh://git.xonotic.org/xonotic-maps.pk3dir

diff --git a/maps/g-23.map.options b/maps/g-23.map.options
index 32aec5ec6fb135ccac0e2f5f83a5c3638d714dbe..539ea744ed42965affe25c33fefd123bf2dd3793 100644 (file)
--- a/maps/g-23.map.options
+++ b/maps/g-23.map.options
@@ -1,5 +1,5 @@
 -bsp +
--light +
+-light + -bounce 8 -dirtscale 2 -filter
 -vis +
 -minimap +
 Version: 1

diff --git a/scripts/effects_item.shader b/scripts/effects_item.shader
new file mode 100644 (file)
index 0000000..c506148
--- /dev/null
+++ b/scripts/effects_item.shader
@@ -0,0 +1,24 @@
+textures/effects_item/respawnring-red
+{
+       surfaceparm nolightmap
+       surfaceparm nomarks
+       surfaceparm trans
+       {
+               map textures/effects_item/respawnring-red.tga
+               blendfunc add
+               rgbGen identity
+       }
+}
+
+textures/effects_item/respawnring-blue
+{
+       surfaceparm nolightmap
+       surfaceparm nomarks
+       surfaceparm trans
+       {
+               map textures/effects_item/respawnring-blue.tga
+               blendfunc add
+               rgbGen identity
+       }
+}
+

diff --git a/scripts/proceduralx.shader b/scripts/proceduralx.shader
new file mode 100644 (file)
index 0000000..1fa49b8
--- /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/pattern-tiles02
+{
+       qer_editorimage textures/proceduralx/pattern/tiles02
+       dpoffsetmapping - 1
+       q3map_bouncescale 1.25
+       dpreflectcube cubemaps/default/sky
+
+
+       {
+               map textures/proceduralx/pattern/tiles02
+                               
+       }
+
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+
+
+textures/proceduralx/pattern-tiles01
+{
+       qer_editorimage textures/proceduralx/pattern/tiles01
+       dpoffsetmapping - 1
+       q3map_bouncescale 1.25
+       dpreflectcube cubemaps/default/sky
+
+
+       {
+               map textures/proceduralx/pattern/tiles01
+                               
+       }
+
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+
+
+textures/proceduralx/pattern-tiles04
+{
+       qer_editorimage textures/proceduralx/pattern/tiles04
+       dpoffsetmapping - 1
+       q3map_bouncescale 1.25
+       dpreflectcube cubemaps/default/sky
+
+
+       {
+               map textures/proceduralx/pattern/tiles04
+                               
+       }
+
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+
+
+textures/proceduralx/pattern-tiles03
+{
+       qer_editorimage textures/proceduralx/pattern/tiles03
+       dpoffsetmapping - 1
+       q3map_bouncescale 1.25
+       dpreflectcube cubemaps/default/sky
+
+
+       {
+               map textures/proceduralx/pattern/tiles03
+                               
+       }
+
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+
+
+textures/proceduralx/pattern-tiles05
+{
+       qer_editorimage textures/proceduralx/pattern/tiles05
+       dpoffsetmapping - 1
+       q3map_bouncescale 1.25
+       dpreflectcube cubemaps/default/sky
+
+
+       {
+               map textures/proceduralx/pattern/tiles05
+                               
+       }
+
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+
+

diff --git a/textures/effects_item/respawnring-blue.jpg b/textures/effects_item/respawnring-blue.jpg
new file mode 100644 (file)
index 0000000..52a6385
Binary files /dev/null and b/textures/effects_item/respawnring-blue.jpg differ

diff --git a/textures/effects_item/respawnring-red.jpg b/textures/effects_item/respawnring-red.jpg
new file mode 100644 (file)
index 0000000..eb1562e
Binary files /dev/null and b/textures/effects_item/respawnring-red.jpg differ

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

diff --git a/textures/proceduralx/pattern/tiles01_gloss.tga b/textures/proceduralx/pattern/tiles01_gloss.tga
new file mode 100644 (file)
index 0000000..4e578e2
Binary files /dev/null and b/textures/proceduralx/pattern/tiles01_gloss.tga differ

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

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

diff --git a/textures/proceduralx/pattern/tiles02.tga b/textures/proceduralx/pattern/tiles02.tga
new file mode 100644 (file)
index 0000000..567c838
Binary files /dev/null and b/textures/proceduralx/pattern/tiles02.tga differ

diff --git a/textures/proceduralx/pattern/tiles02_gloss.tga b/textures/proceduralx/pattern/tiles02_gloss.tga
new file mode 100644 (file)
index 0000000..0d5fe31
Binary files /dev/null and b/textures/proceduralx/pattern/tiles02_gloss.tga differ

diff --git a/textures/proceduralx/pattern/tiles02_norm.tga b/textures/proceduralx/pattern/tiles02_norm.tga
new file mode 100644 (file)
index 0000000..493bb9b
Binary files /dev/null and b/textures/proceduralx/pattern/tiles02_norm.tga differ

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

diff --git a/textures/proceduralx/pattern/tiles03.tga b/textures/proceduralx/pattern/tiles03.tga
new file mode 100644 (file)
index 0000000..51c3401
Binary files /dev/null and b/textures/proceduralx/pattern/tiles03.tga differ

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

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

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

diff --git a/textures/proceduralx/pattern/tiles04.tga b/textures/proceduralx/pattern/tiles04.tga
new file mode 100644 (file)
index 0000000..7bbfed5
Binary files /dev/null and b/textures/proceduralx/pattern/tiles04.tga differ

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

diff --git a/textures/proceduralx/pattern/tiles04_norm.tga b/textures/proceduralx/pattern/tiles04_norm.tga
new file mode 100644 (file)
index 0000000..888e05c
Binary files /dev/null and b/textures/proceduralx/pattern/tiles04_norm.tga differ

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

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

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

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

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