]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'Mario/sniperrifle' into 'master'
authorMario <zacjardine@y7mail.com>
Sun, 21 Feb 2016 07:03:11 +0000 (07:03 +0000)
committerMario <zacjardine@y7mail.com>
Sun, 21 Feb 2016 07:03:11 +0000 (07:03 +0000)
Merge branch Mario/sniperrifle (M merge request)

Adds new rifle model by LJFHutch

See merge request !285

1  2 
scripts/weapons.shader

diff --combined scripts/weapons.shader
index cebdf69c092a2f9e85ab925f884af6c23c353007,52a47e532be73d57f45bfc189107077c36d8d095..bef31839299fda9518ad081b2e51b2d06af7c29a
@@@ -31,11 -31,11 +31,11 @@@ glaunche
                rgbgen lightingDiffuse
        }
  }
 -hagar2
 +hagar
  {
        dpreflectcube cubemaps/default/sky
        {
 -              map textures/hagar2.tga
 +              map textures/hagar.tga
                rgbgen lightingDiffuse
        }
  }
@@@ -111,3 -111,11 +111,11 @@@ shotgu
                rgbgen lightingDiffuse
        }
  }
+ SniperRifle
+ {
+       dpreflectcube cubemaps/default/sky
+       {
+               map textures/sniperrifle.tga
+               rgbgen lightingDiffuse
+       }
+ }