Merge branch 'master' into terencehill/freezetag_fixes

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

diff --git a/scripts/weapons.shader b/scripts/weapons.shader
index 2ed0c9ad660eaadc683525ff8d4025d29e1bfc6b..9749b51cc2d22f2dcc5781507c20a8a7d7a78411 100644 (file)
--- a/scripts/weapons.shader
+++ b/scripts/weapons.shader
@@ -9,6 +9,7 @@ electro
 nexgun
 {
        dpreflectcube cubemaps/default/sky
+       dpoffsetmapping - 0.3 match8 64
        {
                map textures/nexgun.tga
                rgbgen lightingDiffuse
@@ -54,14 +55,6 @@ shotgun2
                rgbgen lightingDiffuse
        }
 }
-nex
-{
-       dpreflectcube cubemaps/default/sky
-       {
-               map textures/nex.tga
-               rgbgen lightingDiffuse
-       }
-}
 rl
 {
        dpreflectcube cubemaps/default/sky
@@ -70,11 +63,11 @@ rl
                rgbgen lightingDiffuse
        }
 }
-laser
+models/weapons/laser
 {
        dpreflectcube cubemaps/default/sky
        {
-               map textures/laser.tga
+               map models/weapons/laser.tga
                rgbgen lightingDiffuse
        }
 }
@@ -102,3 +95,11 @@ seeker
                rgbgen lightingDiffuse
        }
 }
+minelayer
+{
+       dpreflectcube cubemaps/default/sky
+       {
+               map textures/minelayer.tga
+               rgbgen lightingDiffuse
+       }
+}