Merge remote-tracking branch 'origin/master' into samual/runningman_separate

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

diff --git a/scripts/map_lightspeed.shader b/scripts/map_lightspeed.shader
index 48ec25eb54b8c9ec1402fcf35b3ab2312dc5a657..5688108b6c8af0ed68ae2a36e46e8594b459248f 100644 (file)
--- a/scripts/map_lightspeed.shader
+++ b/scripts/map_lightspeed.shader
@@ -4,8 +4,8 @@ textures/map_lightspeed/lightspeedscrn
 
        surfaceparm trans
        surfaceparm nonsolid
-       surfaceparm nodlight
-       surfaceparm nolightmap
+//     surfaceparm nodlight
+//     surfaceparm nolightmap
        qer_trans 0.6
        
        polygonOffset
@@ -14,8 +14,8 @@ textures/map_lightspeed/lightspeedscrn
 
        {
                map textures/map_lightspeed/screens/lightspeedscrn.tga
-               rgbgen identity
-               blendfunc add
+//             rgbgen identity
+               blendfunc blend
                tcMod scroll 0 -0.25
        }
 }
@@ -23,15 +23,15 @@ textures/map_lightspeed/lightspeedscrn
 textures/map_lightspeed/lightspeedscrn_t
 {
        qer_editorimage textures/map_lightspeed/screens/lightspeedscrn1.tga
-       surfaceparm nolightmap
-       surfaceparm nodlight
+//     surfaceparm nolightmap
+//     surfaceparm nodlight
        surfaceparm trans
        cull none
        qer_trans 0.6
        
        {
                animMap 18 textures/map_lightspeed/screens/lightspeedscrn1.tga textures/map_lightspeed/screens/lightspeedscrn2.tga textures/map_lightspeed/screens/lightspeedscrn3.tga textures/map_lightspeed/screens/lightspeedscrn4.tga textures/map_lightspeed/screens/lightspeedscrn5.tga textures/map_lightspeed/screens/lightspeedscrn4.tga textures/map_lightspeed/screens/lightspeedscrn3.tga textures/map_lightspeed/screens/lightspeedscrn2.tga
-               blendfunc add
+               blendfunc blend
        }
 }
 
@@ -43,6 +43,14 @@ textures/map_lightspeed/lcd_compile
        }
 }
 
+models/map_lightspeed/lcd_map
+{
+       qer_editorimage models/map_lightspeed/lcd/lcd_map.jpg
+               {
+               map models/map_lightspeed/lcd/lcd_map.jpg
+       }
+}
+
 textures/map_lightspeed/light_nonglow
 {
        qer_editorimage textures/map_lightspeed/light/light_1.tga
@@ -69,14 +77,21 @@ textures/map_lightspeed/light_nonglow
 textures/map_lightspeed/vines
 {
        qer_editorimage models/map_lightspeed/vines/vines01.tga
-       surfaceparm nomarks
-       surfaceparm trans
-       surfaceparm alphashadow
+       surfaceparm nonsolid
+       surfaceparm nodlight
+       surfaceparm nolightmap
+
+       polygonOffset
+       sort 6
        cull none
+       
+       
+       
        {
                map models/map_lightspeed/vines/vines01.tga
+               blendfunc filter
                alphaFunc GT0
-               rgbGen vertex
+               rgbGen identity
        }
 }