From: Mircea Kitsune Date: Sun, 5 Jul 2020 20:23:11 +0000 (+0300) Subject: New Shotgun and Uzi models X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=75bc72d50d9ca3f2611cf89d7e38dcb7eaee443b;p=xonotic%2Fxonotic-data.pk3dir.git New Shotgun and Uzi models --- diff --git a/models/weapons/g_shotgun.md3 b/models/weapons/g_shotgun.md3 index 3838be811..c242c41a3 100644 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 76062c6d4..d373cd21b 100644 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 d4a628799..5100bb11b 100644 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 53b27c6b5..a67b02ff5 100644 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 85f27d5c0..8a51bfb79 100644 --- 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 index 000000000..ed0b00f1f Binary files /dev/null and b/textures/shotgun.tga differ diff --git a/textures/shotgun2.tga b/textures/shotgun2.tga deleted file mode 100644 index cdfd47d42..000000000 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 index 78fdd3167..000000000 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 index 10e3c433c..000000000 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 index 100b3a4ac..000000000 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 index 8bc227c20..000000000 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 index 000000000..74b787bec 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 index 000000000..168a362bc 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 index 000000000..09a0bd1c4 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 index 000000000..ae60e6103 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 index 000000000..bbcb6f43e 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 index 36ce078d0..000000000 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 index e43284257..000000000 Binary files a/textures/shotgun_sight_glow.tga and /dev/null differ diff --git a/textures/uzi.tga b/textures/uzi.tga index 45f2d9bf7..580af05f5 100644 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 8a40bafb0..9a366bbbc 100644 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 ee180f442..4ddb3b8bc 100644 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 8df77a4da..25058fbdb 100644 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 f4d246d7e..08739faf3 100644 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 index 000000000..83b850ed8 Binary files /dev/null and b/textures/uzi_shirt.tga differ