Merge remote-tracking branch 'origin/master' into terencehill/cursormode

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

diff --git a/scripts/weapons.shader b/scripts/weapons.shader
index dfbbd5e8af8ad13cf5f7e85f255b56edb2b5c566..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
@@ -65,16 +66,6 @@ rl
 models/weapons/laser
 {
        dpreflectcube cubemaps/default/sky
-    dpoffsetmapping - 0.25 match8 128
-       {
-               map models/weapons/laser.tga
-               rgbgen lightingDiffuse
-       }
-}
-laser
-{
-       dpreflectcube cubemaps/default/sky
-       dpoffsetmapping - 0.25 match8 128
        {
                map models/weapons/laser.tga
                rgbgen lightingDiffuse
@@ -108,7 +99,7 @@ minelayer
 {
        dpreflectcube cubemaps/default/sky
        {
-               map textures/minelayer.tga
+               map textures/minelayer.tga      
                rgbgen lightingDiffuse
        }
 }