Merge branch 'master' into mirceakitsune/sandbox

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

diff --git a/scripts/weapons.shader b/scripts/weapons.shader
index 261fd93a6d560fa35bfe42bd75da0e71153106e5..1243955c8b66cf7c69663922d64b9f26a0f9fc34 100644 (file)
--- a/scripts/weapons.shader
+++ b/scripts/weapons.shader
@@ -1,11 +1,3 @@
-textures/electro
-{
-       dpreflectcube cubemaps/default/sky
-       {
-               map textures/electro.tga
-               rgbgen lightingDiffuse
-       }
-}
 electro
 {
        dpreflectcube cubemaps/default/sky
@@ -14,15 +6,7 @@ electro
                rgbgen lightingDiffuse
        }
 }
-textures/nexgun.tga
-{
-       dpreflectcube cubemaps/default/sky
-       {
-               map textures/nexgun.tga
-               rgbgen lightingDiffuse
-       }
-}
-nexgun.tga
+nexgun
 {
        dpreflectcube cubemaps/default/sky
        {
@@ -30,7 +14,7 @@ nexgun.tga
                rgbgen lightingDiffuse
        }
 }
-textures/uzi.tga
+uzi
 {
        dpreflectcube cubemaps/default/sky
        {
@@ -38,7 +22,7 @@ textures/uzi.tga
                rgbgen lightingDiffuse
        }
 }
-textures/glauncher
+glauncher
 {
        dpreflectcube cubemaps/default/sky
        {
@@ -46,7 +30,7 @@ textures/glauncher
                rgbgen lightingDiffuse
        }
 }
-textures/hagar2.tga
+hagar2
 {
        dpreflectcube cubemaps/default/sky
        {
@@ -54,7 +38,7 @@ textures/hagar2.tga
                rgbgen lightingDiffuse
        }
 }
-textures/crylink.tga
+crylink
 {
        dpreflectcube cubemaps/default/sky
        {
@@ -62,31 +46,7 @@ textures/crylink.tga
                rgbgen lightingDiffuse
        }
 }
-crylink.tga
-{
-       dpreflectcube cubemaps/default/sky
-       {
-               map textures/crylink.tga
-               rgbgen lightingDiffuse
-       }
-}
-textures/hlac_body.tga
-{
-       dpreflectcube cubemaps/default/sky
-       {
-               map textures/hlac_body.tga
-               rgbgen lightingDiffuse
-       }
-}
-textures/hlac_accessory.tga
-{
-       dpreflectcube cubemaps/default/sky
-       {
-               map textures/hlac_accessory.tga
-               rgbgen lightingDiffuse
-       }
-}
-textures/shotgun2
+shotgun2
 {
        dpreflectcube cubemaps/default/sky
        {
@@ -94,51 +54,51 @@ textures/shotgun2
                rgbgen lightingDiffuse
        }
 }
-textures/nex.tga
+rl
 {
        dpreflectcube cubemaps/default/sky
        {
-               map textures/nex.tga
+               map textures/rl.tga
                rgbgen lightingDiffuse
        }
 }
-textures/rl.tga
+laser
 {
        dpreflectcube cubemaps/default/sky
        {
-               map textures/rl.tga
+               map textures/laser.tga
                rgbgen lightingDiffuse
        }
 }
-marine
+hlac_accessory
 {
        dpreflectcube cubemaps/default/sky
        {
-               map textures/marine.tga
+               map textures/hlac_accessory.tga
                rgbgen lightingDiffuse
        }
 }
-laser.tga
+hlac_body
 {
        dpreflectcube cubemaps/default/sky
        {
-               map textures/laser.tga
+               map textures/hlac_body.tga
                rgbgen lightingDiffuse
        }
 }
-textures/hlac_accessory
+seeker
 {
        dpreflectcube cubemaps/default/sky
        {
-               map textures/hlac_accessory.tga
+               map textures/seeker.tga
                rgbgen lightingDiffuse
        }
 }
-textures/hlac_body
+minelayer
 {
        dpreflectcube cubemaps/default/sky
        {
-               map textures/hlac_body.tga
+               map textures/minelayer.tga
                rgbgen lightingDiffuse
        }
-}
\ No newline at end of file
+}