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 f197fff21828810ce620bf519bd05651de2e390c..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,61 +39,59 @@ shotgun2
                rgbgen lightingDiffuse
        }
 }
-rl
+models/weapons/laser
 {
        dpreflectcube cubemaps/default/sky
        {
-               map textures/rl.tga
+               map models/weapons/laser.tga
                rgbgen lightingDiffuse
        }
 }
-models/weapons/laser
+hlac_accessory
 {
        dpreflectcube cubemaps/default/sky
-    dpoffsetmapping - 0.25 match8 128
        {
-               map models/weapons/laser.tga
+               map textures/hlac_accessory.tga
                rgbgen lightingDiffuse
        }
 }
-laser
+hlac_body
 {
        dpreflectcube cubemaps/default/sky
-       dpoffsetmapping - 0.25 match8 128
        {
-               map models/weapons/laser.tga
+               map textures/hlac_body.tga
                rgbgen lightingDiffuse
        }
 }
-hlac_accessory
+seeker
 {
        dpreflectcube cubemaps/default/sky
        {
-               map textures/hlac_accessory.tga
+               map textures/seeker.tga
                rgbgen lightingDiffuse
        }
 }
-hlac_body
+minelayer
 {
        dpreflectcube cubemaps/default/sky
        {
-               map textures/hlac_body.tga
+               map textures/minelayer.tga
                rgbgen lightingDiffuse
        }
 }
-seeker
+shotgun
 {
        dpreflectcube cubemaps/default/sky
-       {
-               map textures/seeker.tga
+       {
+               map textures/arc.tga
                rgbgen lightingDiffuse
        }
 }
-minelayer
+SniperRifle
 {
        dpreflectcube cubemaps/default/sky
        {
-               map textures/minelayer.tga
+               map textures/sniperrifle.tga
                rgbgen lightingDiffuse
        }
 }