Merge remote branch 'origin/cbrutail/decals-xonotic'

diff --git a/scripts/logos.shader b/scripts/logos.shader
new file mode 100644 (file)
index 0000000..a43ed83
--- /dev/null
+++ b/scripts/logos.shader
@@ -0,0 +1,335 @@
+textures/logos/logo01_blue
+{
+       qer_editorimage textures/logos/logo01/logo01_blue.tga
+
+       surfaceparm trans
+       surfaceparm nonsolid
+       surfaceparm nodlight
+       surfaceparm nolightmap
+
+       polygonOffset
+       sort 6
+       cull none
+
+       {
+               map textures/logos/logo01/logo01_blue.tga
+               blendFunc filter
+               alphaFunc GT0
+               rgbgen identity
+       }
+}
+
+textures/logos/logo01_blue_glowy
+{
+       qer_editorimage textures/logos/logo01/logo01_blueg.tga
+
+       surfaceparm trans
+       surfaceparm nonsolid
+       surfaceparm nodlight
+       surfaceparm nolightmap
+
+       polygonOffset
+       sort 6
+       cull none
+
+       {
+               map textures/logos/logo01/logo01_blueg.tga
+               blendFunc add
+               alphaFunc GT0
+               rgbgen identity
+       }
+}
+
+textures/logos/logo01_red
+{
+       qer_editorimage textures/logos/logo01/logo01_red.tga
+
+       surfaceparm trans
+       surfaceparm nonsolid
+       surfaceparm nodlight
+       surfaceparm nolightmap
+
+       polygonOffset
+       sort 6
+       cull none
+
+       {
+               map textures/logos/logo01/logo01_red.tga
+               blendFunc filter
+               alphaFunc GT0
+               rgbgen identity
+       }
+}
+
+textures/logos/logo01_red_glowy
+{
+       qer_editorimage textures/logos/logo01/logo01_redg.tga
+
+       surfaceparm trans
+       surfaceparm nonsolid
+       surfaceparm nodlight
+       surfaceparm nolightmap
+
+       polygonOffset
+       sort 6
+       cull none
+
+       {
+               map textures/logos/logo01/logo01_redg.tga
+               blendFunc add
+               alphaFunc GT0
+               rgbgen identity
+       }
+}
+
+textures/logos/logo01_green
+{
+       qer_editorimage textures/logos/logo01/logo01_green.tga
+
+       surfaceparm trans
+       surfaceparm nonsolid
+       surfaceparm nodlight
+       surfaceparm nolightmap
+
+       polygonOffset
+       sort 6
+       cull none
+
+       {
+               map textures/logos/logo01/logo01_green.tga
+               blendFunc filter
+               alphaFunc GT0
+               rgbgen identity
+       }
+}
+
+textures/logos/logo01_green_glowy
+{
+       qer_editorimage textures/logos/logo01/logo01_greeng.tga
+
+       surfaceparm trans
+       surfaceparm nonsolid
+       surfaceparm nodlight
+       surfaceparm nolightmap
+
+       polygonOffset
+       sort 6
+       cull none
+
+       {
+               map textures/logos/logo01/logo01_greeng.tga
+               blendFunc add
+               alphaFunc GT0
+               rgbgen identity
+       }
+}
+
+textures/logos/logo01_yellow
+{
+       qer_editorimage textures/logos/logo01/logo01_yellow.tga
+
+       surfaceparm trans
+       surfaceparm nonsolid
+       surfaceparm nodlight
+       surfaceparm nolightmap
+
+       polygonOffset
+       sort 6
+       cull none
+
+       {
+               map textures/logos/logo01/logo01_yellow.tga
+               blendFunc filter
+               alphaFunc GT0
+               rgbgen identity
+       }
+}
+
+textures/logos/logo01_yellow_glowy
+{
+       qer_editorimage textures/logos/logo01/logo01_yellowg.tga
+
+       surfaceparm trans
+       surfaceparm nonsolid
+       surfaceparm nodlight
+       surfaceparm nolightmap
+
+       polygonOffset
+       sort 6
+       cull none
+
+       {
+               map textures/logos/logo01/logo01_yellowg.tga
+               blendFunc add
+               alphaFunc GT0
+               rgbgen identity
+       }
+}
+
+textures/logos/logo02_red
+{
+       qer_editorimage textures/logos/logo02/logo02_red.tga
+
+       surfaceparm trans
+       surfaceparm nonsolid
+       surfaceparm nodlight
+       surfaceparm nolightmap
+
+       polygonOffset
+       sort 6
+       cull none
+
+       {
+               map textures/logos/logo02/logo02_red.tga
+               blendFunc filter
+               alphaFunc GT0
+               rgbgen identity
+       }
+}
+
+textures/logos/logo02_red_glowy
+{
+       qer_editorimage textures/logos/logo02/logo02_redg.tga
+
+       surfaceparm trans
+       surfaceparm nonsolid
+       surfaceparm nodlight
+       surfaceparm nolightmap
+
+       polygonOffset
+       sort 6
+       cull none
+
+       {
+               map textures/logos/logo02/logo02_redg.tga
+               blendFunc add
+               alphaFunc GT0
+               rgbgen identity
+       }
+}
+
+textures/logos/logo02_blue
+{
+       qer_editorimage textures/logos/logo02/logo02_blue.tga
+
+       surfaceparm trans
+       surfaceparm nonsolid
+       surfaceparm nodlight
+       surfaceparm nolightmap
+
+       polygonOffset
+       sort 6
+       cull none
+
+       {
+               map textures/logos/logo02/logo02_blue.tga
+               blendFunc filter
+               alphaFunc GT0
+               rgbgen identity
+       }
+}
+
+textures/logos/logo02_blue_glowy
+{
+       qer_editorimage textures/logos/logo02/logo02_blueg.tga
+
+       surfaceparm trans
+       surfaceparm nonsolid
+       surfaceparm nodlight
+       surfaceparm nolightmap
+
+       polygonOffset
+       sort 6
+       cull none
+
+       {
+               map textures/logos/logo02/logo02_blueg.tga
+               blendFunc add
+               alphaFunc GT0
+               rgbgen identity
+       }
+}
+
+textures/logos/logo02_green
+{
+       qer_editorimage textures/logos/logo02/logo02_green.tga
+
+       surfaceparm trans
+       surfaceparm nonsolid
+       surfaceparm nodlight
+       surfaceparm nolightmap
+
+       polygonOffset
+       sort 6
+       cull none
+
+       {
+               map textures/logos/logo02/logo02_green.tga
+               blendFunc filter
+               alphaFunc GT0
+               rgbgen identity
+       }
+}
+
+textures/logos/logo02_green_glowy
+{
+       qer_editorimage textures/logos/logo02/logo02_greeng.tga
+
+       surfaceparm trans
+       surfaceparm nonsolid
+       surfaceparm nodlight
+       surfaceparm nolightmap
+
+       polygonOffset
+       sort 6
+       cull none
+
+       {
+               map textures/logos/logo02/logo02_greeng.tga
+               blendFunc add
+               alphaFunc GT0
+               rgbgen identity
+       }
+}
+
+textures/logos/logo02_yellow
+{
+       qer_editorimage textures/logos/logo02/logo02_yellow.tga
+
+       surfaceparm trans
+       surfaceparm nonsolid
+       surfaceparm nodlight
+       surfaceparm nolightmap
+
+       polygonOffset
+       sort 6
+       cull none
+
+       {
+               map textures/logos/logo02/logo02_yellow.tga
+               blendFunc filter
+               alphaFunc GT0
+               rgbgen identity
+       }
+}
+
+textures/logos/logo02_yellow_glowy
+{
+       qer_editorimage textures/logos/logo02/logo02_yellowg.tga
+
+       surfaceparm trans
+       surfaceparm nonsolid
+       surfaceparm nodlight
+       surfaceparm nolightmap
+
+       polygonOffset
+       sort 6
+       cull none
+
+       {
+               map textures/logos/logo02/logo02_yellowg.tga
+               blendFunc add
+               alphaFunc GT0
+               rgbgen identity
+       }
+}
\ No newline at end of file

diff --git a/textures/logos/logo01/logo01_blue.tga b/textures/logos/logo01/logo01_blue.tga
new file mode 100644 (file)
index 0000000..5121fa7
Binary files /dev/null and b/textures/logos/logo01/logo01_blue.tga differ

diff --git a/textures/logos/logo01/logo01_blueg.tga b/textures/logos/logo01/logo01_blueg.tga
new file mode 100644 (file)
index 0000000..4cd051e
Binary files /dev/null and b/textures/logos/logo01/logo01_blueg.tga differ

diff --git a/textures/logos/logo01/logo01_blueg_glow.tga b/textures/logos/logo01/logo01_blueg_glow.tga
new file mode 100644 (file)
index 0000000..02da5eb
Binary files /dev/null and b/textures/logos/logo01/logo01_blueg_glow.tga differ

diff --git a/textures/logos/logo01/logo01_green.tga b/textures/logos/logo01/logo01_green.tga
new file mode 100644 (file)
index 0000000..2fc00f3
Binary files /dev/null and b/textures/logos/logo01/logo01_green.tga differ

diff --git a/textures/logos/logo01/logo01_greeng.tga b/textures/logos/logo01/logo01_greeng.tga
new file mode 100644 (file)
index 0000000..860715e
Binary files /dev/null and b/textures/logos/logo01/logo01_greeng.tga differ

diff --git a/textures/logos/logo01/logo01_greeng_glow.tga b/textures/logos/logo01/logo01_greeng_glow.tga
new file mode 100644 (file)
index 0000000..38df473
Binary files /dev/null and b/textures/logos/logo01/logo01_greeng_glow.tga differ

diff --git a/textures/logos/logo01/logo01_red.tga b/textures/logos/logo01/logo01_red.tga
new file mode 100644 (file)
index 0000000..12c6e57
Binary files /dev/null and b/textures/logos/logo01/logo01_red.tga differ

diff --git a/textures/logos/logo01/logo01_redg.tga b/textures/logos/logo01/logo01_redg.tga
new file mode 100644 (file)
index 0000000..f58a423
Binary files /dev/null and b/textures/logos/logo01/logo01_redg.tga differ

diff --git a/textures/logos/logo01/logo01_redg_glow.tga b/textures/logos/logo01/logo01_redg_glow.tga
new file mode 100644 (file)
index 0000000..9c6d58e
Binary files /dev/null and b/textures/logos/logo01/logo01_redg_glow.tga differ

diff --git a/textures/logos/logo01/logo01_yellow.tga b/textures/logos/logo01/logo01_yellow.tga
new file mode 100644 (file)
index 0000000..4e5f331
Binary files /dev/null and b/textures/logos/logo01/logo01_yellow.tga differ

diff --git a/textures/logos/logo01/logo01_yellowg.tga b/textures/logos/logo01/logo01_yellowg.tga
new file mode 100644 (file)
index 0000000..cafca88
Binary files /dev/null and b/textures/logos/logo01/logo01_yellowg.tga differ

diff --git a/textures/logos/logo01/logo01_yellowg_glow.tga b/textures/logos/logo01/logo01_yellowg_glow.tga
new file mode 100644 (file)
index 0000000..65e67aa
Binary files /dev/null and b/textures/logos/logo01/logo01_yellowg_glow.tga differ

diff --git a/textures/logos/logo02/logo02_blue.tga b/textures/logos/logo02/logo02_blue.tga
new file mode 100644 (file)
index 0000000..b80c8c7
Binary files /dev/null and b/textures/logos/logo02/logo02_blue.tga differ

diff --git a/textures/logos/logo02/logo02_blueg.tga b/textures/logos/logo02/logo02_blueg.tga
new file mode 100644 (file)
index 0000000..f29b859
Binary files /dev/null and b/textures/logos/logo02/logo02_blueg.tga differ

diff --git a/textures/logos/logo02/logo02_blueg_glow.tga b/textures/logos/logo02/logo02_blueg_glow.tga
new file mode 100644 (file)
index 0000000..37f84a8
Binary files /dev/null and b/textures/logos/logo02/logo02_blueg_glow.tga differ

diff --git a/textures/logos/logo02/logo02_green.tga b/textures/logos/logo02/logo02_green.tga
new file mode 100644 (file)
index 0000000..5d2c603
Binary files /dev/null and b/textures/logos/logo02/logo02_green.tga differ

diff --git a/textures/logos/logo02/logo02_greeng.tga b/textures/logos/logo02/logo02_greeng.tga
new file mode 100644 (file)
index 0000000..0334251
Binary files /dev/null and b/textures/logos/logo02/logo02_greeng.tga differ

diff --git a/textures/logos/logo02/logo02_greeng_glow.tga b/textures/logos/logo02/logo02_greeng_glow.tga
new file mode 100644 (file)
index 0000000..5112e3c
Binary files /dev/null and b/textures/logos/logo02/logo02_greeng_glow.tga differ

diff --git a/textures/logos/logo02/logo02_red.tga b/textures/logos/logo02/logo02_red.tga
new file mode 100644 (file)
index 0000000..722a924
Binary files /dev/null and b/textures/logos/logo02/logo02_red.tga differ

diff --git a/textures/logos/logo02/logo02_redg.tga b/textures/logos/logo02/logo02_redg.tga
new file mode 100644 (file)
index 0000000..70becb7
Binary files /dev/null and b/textures/logos/logo02/logo02_redg.tga differ

diff --git a/textures/logos/logo02/logo02_redg_glow.tga b/textures/logos/logo02/logo02_redg_glow.tga
new file mode 100644 (file)
index 0000000..56f0669
Binary files /dev/null and b/textures/logos/logo02/logo02_redg_glow.tga differ

diff --git a/textures/logos/logo02/logo02_yellow.tga b/textures/logos/logo02/logo02_yellow.tga
new file mode 100644 (file)
index 0000000..9519092
Binary files /dev/null and b/textures/logos/logo02/logo02_yellow.tga differ

diff --git a/textures/logos/logo02/logo02_yellowg.tga b/textures/logos/logo02/logo02_yellowg.tga
new file mode 100644 (file)
index 0000000..c45671d
Binary files /dev/null and b/textures/logos/logo02/logo02_yellowg.tga differ

diff --git a/textures/logos/logo02/logo02_yellowg_glow.tga b/textures/logos/logo02/logo02_yellowg_glow.tga
new file mode 100644 (file)
index 0000000..1a7a2fe
Binary files /dev/null and b/textures/logos/logo02/logo02_yellowg_glow.tga differ