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 1243955c8b66cf7c69663922d64b9f26a0f9fc34..e2df348134f6a110de17fa94a19ea9e8d117582a 100644 (file)
--- a/scripts/weapons.shader
+++ b/scripts/weapons.shader
@@ -1,14 +1,7 @@
-electro
-{
-       dpreflectcube cubemaps/default/sky
-       {
-               map textures/electro.tga
-               rgbgen lightingDiffuse
-       }
-}
 nexgun
 {
        dpreflectcube cubemaps/default/sky
+       dpoffsetmapping - 0.3 match8 64
        {
                map textures/nexgun.tga
                rgbgen lightingDiffuse
@@ -22,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
        }
 }
@@ -54,19 +39,11 @@ shotgun2
                rgbgen lightingDiffuse
        }
 }
-rl
+models/weapons/laser
 {
        dpreflectcube cubemaps/default/sky
        {
-               map textures/rl.tga
-               rgbgen lightingDiffuse
-       }
-}
-laser
-{
-       dpreflectcube cubemaps/default/sky
-       {
-               map textures/laser.tga
+               map models/weapons/laser.tga
                rgbgen lightingDiffuse
        }
 }
@@ -102,3 +79,19 @@ minelayer
                rgbgen lightingDiffuse
        }
 }
+shotgun
+{
+       dpreflectcube cubemaps/default/sky
+       {
+               map textures/arc.tga
+               rgbgen lightingDiffuse
+       }
+}
+SniperRifle
+{
+       dpreflectcube cubemaps/default/sky
+       {
+               map textures/sniperrifle.tga
+               rgbgen lightingDiffuse
+       }
+}