New Shotgun and Uzi models

diff --git a/models/weapons/g_shotgun.md3 b/models/weapons/g_shotgun.md3
index 3838be811d7e9437f898e2581945cb2192cea754..c242c41a33dba848a89131e6a80f634a98f059f9 100644 (file)
Binary files a/models/weapons/g_shotgun.md3 and b/models/weapons/g_shotgun.md3 differ

diff --git a/models/weapons/g_uzi.md3 b/models/weapons/g_uzi.md3
index 76062c6d44f4dc0957473425c1b7558975a45d83..d373cd21b580bdab72f512d7962a7f84468cc552 100644 (file)
Binary files a/models/weapons/g_uzi.md3 and b/models/weapons/g_uzi.md3 differ

diff --git a/models/weapons/v_shotgun.md3 b/models/weapons/v_shotgun.md3
index d4a6287991b207781085069e89aaaf83d0ac254a..5100bb11b1d38c394ed4d87880941d0255b4729b 100644 (file)
Binary files a/models/weapons/v_shotgun.md3 and b/models/weapons/v_shotgun.md3 differ

diff --git a/models/weapons/v_uzi.md3 b/models/weapons/v_uzi.md3
index 53b27c6b589f4784f103a156e8c4b939308cd2c1..a67b02ff537cdb2eb3312e7c18300edf076d9ee6 100644 (file)
Binary files a/models/weapons/v_uzi.md3 and b/models/weapons/v_uzi.md3 differ

diff --git a/scripts/weapons.shader b/scripts/weapons.shader
index 85f27d5c0b748f7fd6ff26849f253ea68891a50d..8a51bfb79d79d8780a03e51c9923b5134be7e102 100644 (file)
--- a/scripts/weapons.shader
+++ b/scripts/weapons.shader
@@ -83,7 +83,7 @@ shotgun
 {
        dpreflectcube cubemaps/default/sky
        {
-               map textures/arc.tga
+               map textures/shotgun.tga
                rgbgen lightingDiffuse
        }
 }

diff --git a/textures/shotgun.tga b/textures/shotgun.tga
new file mode 100644 (file)
index 0000000..ed0b00f
Binary files /dev/null and b/textures/shotgun.tga differ

diff --git a/textures/shotgun2.tga b/textures/shotgun2.tga
deleted file mode 100644 (file)
index cdfd47d..0000000
Binary files a/textures/shotgun2.tga and /dev/null differ

diff --git a/textures/shotgun2_gloss.tga b/textures/shotgun2_gloss.tga
deleted file mode 100644 (file)
index 78fdd31..0000000
Binary files a/textures/shotgun2_gloss.tga and /dev/null differ

diff --git a/textures/shotgun2_glow.tga b/textures/shotgun2_glow.tga
deleted file mode 100644 (file)
index 10e3c43..0000000
Binary files a/textures/shotgun2_glow.tga and /dev/null differ

diff --git a/textures/shotgun2_norm.tga b/textures/shotgun2_norm.tga
deleted file mode 100644 (file)
index 100b3a4..0000000
Binary files a/textures/shotgun2_norm.tga and /dev/null differ

diff --git a/textures/shotgun2_shirt.tga b/textures/shotgun2_shirt.tga
deleted file mode 100644 (file)
index 8bc227c..0000000
Binary files a/textures/shotgun2_shirt.tga and /dev/null differ

diff --git a/textures/shotgun_gloss.tga b/textures/shotgun_gloss.tga
new file mode 100644 (file)
index 0000000..74b787b
Binary files /dev/null and b/textures/shotgun_gloss.tga differ

diff --git a/textures/shotgun_glow.tga b/textures/shotgun_glow.tga
new file mode 100644 (file)
index 0000000..168a362
Binary files /dev/null and b/textures/shotgun_glow.tga differ

diff --git a/textures/shotgun_norm.tga b/textures/shotgun_norm.tga
new file mode 100644 (file)
index 0000000..09a0bd1
Binary files /dev/null and b/textures/shotgun_norm.tga differ

diff --git a/textures/shotgun_reflect.tga b/textures/shotgun_reflect.tga
new file mode 100644 (file)
index 0000000..ae60e61
Binary files /dev/null and b/textures/shotgun_reflect.tga differ

diff --git a/textures/shotgun_shirt.tga b/textures/shotgun_shirt.tga
new file mode 100644 (file)
index 0000000..bbcb6f4
Binary files /dev/null and b/textures/shotgun_shirt.tga differ

diff --git a/textures/shotgun_sight.tga b/textures/shotgun_sight.tga
deleted file mode 100644 (file)
index 36ce078..0000000
Binary files a/textures/shotgun_sight.tga and /dev/null differ

diff --git a/textures/shotgun_sight_glow.tga b/textures/shotgun_sight_glow.tga
deleted file mode 100644 (file)
index e432842..0000000
Binary files a/textures/shotgun_sight_glow.tga and /dev/null differ

diff --git a/textures/uzi.tga b/textures/uzi.tga
index 45f2d9bf79db2a5cd12418a32c1300dc18f0af3e..580af05f5a822339782ba3e2355eb5275ae1a0bb 100644 (file)
Binary files a/textures/uzi.tga and b/textures/uzi.tga differ

diff --git a/textures/uzi_gloss.tga b/textures/uzi_gloss.tga
index 8a40bafb08aed3bb75ccbaa793582ab12bc5652a..9a366bbbc90f238071f160dcd8647297ff25c734 100644 (file)
Binary files a/textures/uzi_gloss.tga and b/textures/uzi_gloss.tga differ

diff --git a/textures/uzi_glow.tga b/textures/uzi_glow.tga
index ee180f442a6901c84d14ce91c7225b64fe3349f0..4ddb3b8bca84954578096d0666dfaf28543c6aff 100644 (file)
Binary files a/textures/uzi_glow.tga and b/textures/uzi_glow.tga differ

diff --git a/textures/uzi_norm.tga b/textures/uzi_norm.tga
index 8df77a4da1bc10cb8d9bf105f2087222ed63f38e..25058fbdb92db9df275dec9a903761550be5897b 100644 (file)
Binary files a/textures/uzi_norm.tga and b/textures/uzi_norm.tga differ

diff --git a/textures/uzi_reflect.tga b/textures/uzi_reflect.tga
index f4d246d7e08f0110ca2ee4257ace4a0f0732e2b5..08739faf372ac6bdaace102cbfe90e9078f53492 100644 (file)
Binary files a/textures/uzi_reflect.tga and b/textures/uzi_reflect.tga differ

diff --git a/textures/uzi_shirt.tga b/textures/uzi_shirt.tga
new file mode 100644 (file)
index 0000000..83b850e
Binary files /dev/null and b/textures/uzi_shirt.tga differ