Merge remote-tracking branch 'origin/master' into divVerent/meleefix

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

diff --git a/scripts/weapons.shader b/scripts/weapons.shader
index c093eb3334808095149715e2413d7ad8ef68f542..a6dcfaab86df5c107a1f64fce159d06f98359b1a 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
        }
 }
@@ -106,7 +99,7 @@ minelayer
 {
        dpreflectcube cubemaps/default/sky
        {
-               map textures/minelayer.tga
+               map textures/minelayer.tga      
                rgbgen lightingDiffuse
        }
 }