From: Mario <mario@smbclan.net>
Date: Mon, 15 Feb 2016 00:06:59 +0000 (+1000)
Subject: Add sniper rifle by LJFHutch
X-Git-Tag: xonotic-v0.8.2~1182^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fmerge-requests%2F285%2Fhead;p=xonotic%2Fxonotic-data.pk3dir.git

Add sniper rifle by LJFHutch
---

diff --git a/models/weapons/g_campingrifle.md3 b/models/weapons/g_campingrifle.md3
index 594e706f81..fd829833e2 100644
Binary files a/models/weapons/g_campingrifle.md3 and b/models/weapons/g_campingrifle.md3 differ
diff --git a/models/weapons/v_campingrifle.md3 b/models/weapons/v_campingrifle.md3
index 251e79f75c..e9990ebc32 100644
Binary files a/models/weapons/v_campingrifle.md3 and b/models/weapons/v_campingrifle.md3 differ
diff --git a/scripts/weapons.shader b/scripts/weapons.shader
index c5c673fbff..52a47e532b 100644
--- a/scripts/weapons.shader
+++ b/scripts/weapons.shader
@@ -111,3 +111,11 @@ shotgun
 		rgbgen lightingDiffuse
 	}
 }
+SniperRifle
+{
+	dpreflectcube cubemaps/default/sky
+ 	{
+		map textures/sniperrifle.tga
+		rgbgen lightingDiffuse
+	}
+}
diff --git a/textures/campingrifle.tga b/textures/campingrifle.tga
deleted file mode 100644
index 6189b51e95..0000000000
Binary files a/textures/campingrifle.tga and /dev/null differ
diff --git a/textures/campingrifle_bump.tga b/textures/campingrifle_bump.tga
deleted file mode 100644
index 28bd453d6d..0000000000
Binary files a/textures/campingrifle_bump.tga and /dev/null differ
diff --git a/textures/campingrifle_gloss.tga b/textures/campingrifle_gloss.tga
deleted file mode 100644
index 7f4b0326dd..0000000000
Binary files a/textures/campingrifle_gloss.tga and /dev/null differ
diff --git a/textures/campingrifle_glow.tga b/textures/campingrifle_glow.tga
deleted file mode 100644
index f42532995f..0000000000
Binary files a/textures/campingrifle_glow.tga and /dev/null differ
diff --git a/textures/campingrifle_screen.tga b/textures/campingrifle_screen.tga
deleted file mode 100644
index 5ffda6faf2..0000000000
Binary files a/textures/campingrifle_screen.tga and /dev/null differ
diff --git a/textures/sniperrifle.tga b/textures/sniperrifle.tga
new file mode 100644
index 0000000000..0448be7f66
Binary files /dev/null and b/textures/sniperrifle.tga differ
diff --git a/textures/sniperrifle_bump.tga b/textures/sniperrifle_bump.tga
new file mode 100644
index 0000000000..2496bcbcec
Binary files /dev/null and b/textures/sniperrifle_bump.tga differ
diff --git a/textures/sniperrifle_glow.tga b/textures/sniperrifle_glow.tga
new file mode 100644
index 0000000000..776771371d
Binary files /dev/null and b/textures/sniperrifle_glow.tga differ
diff --git a/textures/sniperrifle_reflect.tga b/textures/sniperrifle_reflect.tga
new file mode 100644
index 0000000000..ecd89a973c
Binary files /dev/null and b/textures/sniperrifle_reflect.tga differ