Merge branch 'terencehill/mapvote_winnermap' into 'master'

[xonotic/xonotic-data.pk3dir.git] / scripts / weapons.shader

diff --git a/scripts/weapons.shader b/scripts/weapons.shader
index a0d3c584c316bcb8492dee7f9621175b0a699f65..e2df348134f6a110de17fa94a19ea9e8d117582a 100644 (file)
--- a/scripts/weapons.shader
+++ b/scripts/weapons.shader
@@ -1,11 +1,3 @@
-electro
-{
-       dpreflectcube cubemaps/default/sky
-       {
-               map textures/electro.tga
-               rgbgen lightingDiffuse
-       }
-}
 nexgun
 {
        dpreflectcube cubemaps/default/sky
@@ -23,19 +15,11 @@ uzi
                rgbgen lightingDiffuse
        }
 }
-glauncher
+hagar
 {
        dpreflectcube cubemaps/default/sky
        {
-               map textures/glauncher.tga
-               rgbgen lightingDiffuse
-       }
-}
-hagar2
-{
-       dpreflectcube cubemaps/default/sky
-       {
-               map textures/hagar2.tga
+               map textures/hagar.tga
                rgbgen lightingDiffuse
        }
 }
@@ -55,14 +39,6 @@ shotgun2
                rgbgen lightingDiffuse
        }
 }
-rl
-{
-       dpreflectcube cubemaps/default/sky
-       {
-               map textures/rl.tga
-               rgbgen lightingDiffuse
-       }
-}
 models/weapons/laser
 {
        dpreflectcube cubemaps/default/sky
@@ -99,19 +75,23 @@ minelayer
 {
        dpreflectcube cubemaps/default/sky
        {
-               map textures/minelayer.tga      
+               map textures/minelayer.tga
                rgbgen lightingDiffuse
        }
 }
-
-crylink_simple
+shotgun
 {
-       deformVertexes autosprite
-       cull none
+       dpreflectcube cubemaps/default/sky
+       {
+               map textures/arc.tga
+               rgbgen lightingDiffuse
+       }
+}
+SniperRifle
+{
+       dpreflectcube cubemaps/default/sky
        {
-               map models/weapons/crylink_simple
-               blendfunc blend
-               //rgbgen lightingDiffuse
-
+               map textures/sniperrifle.tga
+               rgbgen lightingDiffuse
        }
-}
\ No newline at end of file
+}