Merge remote-tracking branch 'origin/master' into divVerent/courtfun2

[xonotic/xonotic-maps.pk3dir.git] / scripts / logos.shader

diff --git a/scripts/logos.shader b/scripts/logos.shader
index 663a7579caba3ef9e2658df56a064323561c7533..a43ed83aae94c0cb03e3e8fb39975a8540956920 100644 (file)
--- a/scripts/logos.shader
+++ b/scripts/logos.shader
@@ -34,7 +34,7 @@ textures/logos/logo01_blue_glowy
 
        {
                map textures/logos/logo01/logo01_blueg.tga
-               blendFunc filter
+               blendFunc add
                alphaFunc GT0
                rgbgen identity
        }
@@ -76,7 +76,7 @@ textures/logos/logo01_red_glowy
 
        {
                map textures/logos/logo01/logo01_redg.tga
-               blendFunc filter
+               blendFunc add
                alphaFunc GT0
                rgbgen identity
        }
@@ -118,7 +118,7 @@ textures/logos/logo01_green_glowy
 
        {
                map textures/logos/logo01/logo01_greeng.tga
-               blendFunc filter
+               blendFunc add
                alphaFunc GT0
                rgbgen identity
        }
@@ -160,7 +160,7 @@ textures/logos/logo01_yellow_glowy
 
        {
                map textures/logos/logo01/logo01_yellowg.tga
-               blendFunc filter
+               blendFunc add
                alphaFunc GT0
                rgbgen identity
        }
@@ -202,8 +202,134 @@ textures/logos/logo02_red_glowy
 
        {
                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