]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
fix blendfunc add use
authorRudolf Polzer <divVerent@xonotic.org>
Sat, 3 Sep 2011 11:23:23 +0000 (13:23 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Sat, 3 Sep 2011 11:23:23 +0000 (13:23 +0200)
scripts/flags.shader [deleted file]
scripts/projectiles.shader
scripts/relics.shader
scripts/rocket.shader
scripts/turrets.shader
scripts/vehicles.shader

diff --git a/scripts/flags.shader b/scripts/flags.shader
deleted file mode 100644 (file)
index 1ed38d6..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-flags/flag_red_cloth {
-       cull none
-       deformVertexes wave 100 sin 0 0.4 0 2.5
-       {
-               map textures/flags/flag_red_cloth.tga
-       }
-}
-
-flags/flag_red_laser {
-       {
-               map textures/flags/flag_red_laser.tga
-               tcMod scroll 0.2 -1
-               blendfunc add
-       }
-}
-
-
-flags/flag_blue_cloth {
-       cull none
-       deformVertexes wave 100 sin 0 0.4 0 2.5
-       {
-               map textures/flags/flag_blue_cloth.tga
-       }
-}
-
-flags/flag_blue_laser {
-       {
-               map textures/flags/flag_blue_laser.tga
-               tcMod scroll 0.2 -1
-               blendfunc add
-       }
-}
-
index 28b1e94920f0df7b3b9243b7c5794ca4028a1e80..16847e57df575697f5c4cd0904ef1ff00e705eb8 100644 (file)
@@ -5,7 +5,7 @@ crylink_projectile_core
        deformVertexes autosprite
        {
                map textures/projectiles/crylink_projectile_core.tga
-               blendfunc add
+               blendfunc GL_SRC_ALPHA GL_ONE
                rgbGen lightingDiffuse
        }
 }
@@ -16,7 +16,7 @@ crylink_projectile_long
        deformVertexes autosprite2
        {
                map textures/projectiles/crylink_projectile_long.tga
-               blendfunc add
+               blendfunc GL_SRC_ALPHA GL_ONE
                rgbGen lightingDiffuse
        }
 }
@@ -87,4 +87,4 @@ laser_projectile_long
                blendfunc add
                rgbGen lightingDiffuse
        }
-}
\ No newline at end of file
+}
index dd8372f1a36855217c82a79418fd57137df46af2..24f95617f1e235736de4070cad542afec746cbc3 100644 (file)
@@ -10,7 +10,7 @@ models/relics/relic_ring
 {
        {
                map models/relics/relic_ring.tga
-               blendfunc add
+               blendfunc GL_SRC_ALPHA GL_ONE
                rgbgen lightingDiffuse
        }
 }
index b3041f215c6dc06496ec1c362c5f68aacaa2e9c7..a5c9d181df5bfb063a0261f6b011c60d7e949076 100644 (file)
@@ -4,7 +4,7 @@ rocketThrust
        cull disable
        {
                clampmap textures/thrustc1.tga
-               blendfunc add
+               blendfunc GL_SRC_ALPHA GL_ONE
                tcMod rotate 720
        }
 }
index 9e4f68e3ff7fa4ef200dd3b223d3d3e35363e270..006f67dd31a4ae721d9fc90df6830fb5c90c9802 100644 (file)
@@ -22,7 +22,7 @@ models/turrets/phaser_beam
        qer_editorimage models/turrets/phaser_beam
        {               
                map models/turrets/phaser_beam
-               blendFunc add
+               blendFunc GL_SRC_ALPHA GL_ONE
        }
 
 }
index 023e277aa6d8217a53873a1eeaa50743fed7aef2..2d4d606752fc7f79cb8b72a068b62368a9cbc68e 100644 (file)
@@ -41,8 +41,8 @@ vehicles/tracertrail
        deformVertexes autosprite2
        {
                map models/vehicles/tracertrail.tga
-               blendfunc add
+               blendfunc GL_SRC_ALPHA GL_ONE
                rgbGen lightingDiffuse
        }
 }
-       
\ No newline at end of file
+