Merge branch 'master' into cbrutail/g-23_cant_take_it_anymore

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

diff --git a/scripts/map_lightspeed.shader b/scripts/map_lightspeed.shader
index bf11e9d88f6100e542390f424cff6a4aa397aeb4..7565ff728db99a007a467d9ee196d347e40cc29f 100644 (file)
--- a/scripts/map_lightspeed.shader
+++ b/scripts/map_lightspeed.shader
@@ -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
@@ -90,19 +98,13 @@ textures/map_lightspeed/env1
        surfaceparm nolightmap
        cull none
        q3map_globaltexture
-       tessSize 256
        {
                map textures/map_lightspeed/env/env1.tga
-               tcMod turb 0 0.04 0 0.08
+               //tcMod turb 0 0.04 0 0.08
                blendfunc add
        }
-       dpreflectcube textures/map_lightspeed/env/env1.tga
-       {
-               map $lightmap
-               blendfunc add
-               tcGen lightmap
-       }       
-       dp_water 0.1 0.25  3 3  1 1 1  1 1 1  0.125
+       dpreflectcube textures/map_lightspeed/env/env1_
+       dp_reflect 0  1 1 1 1
 }
 
 textures/map_lightspeed/env2
@@ -115,19 +117,13 @@ textures/map_lightspeed/env2
        surfaceparm nolightmap
        cull none
        q3map_globaltexture
-       tessSize 256
        {
                map textures/map_lightspeed/env/env2.tga
-               tcMod turb 0 0.04 0 0.08
+               //tcMod turb 0 0.04 0 0.08
                blendfunc add
        }
-       dpreflectcube textures/map_lightspeed/env/env2.tga
-       {
-               map $lightmap
-               blendfunc add
-               tcGen lightmap
-       }       
-       dp_water 0.1 0.25  3 3  1 1 1  1 1 1  0.125
+       dpreflectcube textures/map_lightspeed/env/env2_
+       dp_reflect 0  1 1 1 1
 }
 
 textures/map_lightspeed/env3
@@ -140,19 +136,13 @@ textures/map_lightspeed/env3
        surfaceparm nolightmap
        cull none
        q3map_globaltexture
-       tessSize 256
        {
                map textures/map_lightspeed/env/env3.tga
-               tcMod turb 0 0.04 0 0.08
+               //tcMod turb 0 0.04 0 0.08
                blendfunc add
        }
-       dpreflectcube textures/map_lightspeed/env/env3.tga
-       {
-               map $lightmap
-               blendfunc add
-               tcGen lightmap
-       }       
-       dp_water 0.1 0.25  3 3  1 1 1  1 1 1  0.125
+       dpreflectcube textures/map_lightspeed/env/env3_
+       dp_reflect 0  1 1 1 1
 }
 
 //Lightning1-a