From: Mario Date: Thu, 10 Dec 2015 22:35:12 +0000 (+1000) Subject: Fix some minor annoyances X-Git-Tag: xonotic-v0.8.2~1516 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4cffe55ef7f66317a3d37ff0c7d89a2bbf405072;p=xonotic%2Fxonotic-data.pk3dir.git Fix some minor annoyances --- diff --git a/models/ok_nade_counter/ok_nade_counter.md3_9.skin b/models/ok_nade_counter/ok_nade_counter.md3_9.skin index 1402b7a0b..e3df814e3 100644 --- a/models/ok_nade_counter/ok_nade_counter.md3_9.skin +++ b/models/ok_nade_counter/ok_nade_counter.md3_9.skin @@ -1 +1 @@ -sprite,models/ok_nade_counter/ok_nade_counter_10 \ No newline at end of file +sprite,models/ok_nade_counter/ok_nade_counter_09 \ No newline at end of file diff --git a/models/weapons/overkillbullet.tga b/models/weapons/overkillbullet.tga deleted file mode 100644 index f48d302fa..000000000 Binary files a/models/weapons/overkillbullet.tga and /dev/null differ diff --git a/models/weapons/overkillbullet_gloss.tga b/models/weapons/overkillbullet_gloss.tga deleted file mode 100644 index 08f2fd001..000000000 Binary files a/models/weapons/overkillbullet_gloss.tga and /dev/null differ diff --git a/models/weapons/overkillbullet_reflect.tga b/models/weapons/overkillbullet_reflect.tga deleted file mode 100644 index ecb0222e3..000000000 Binary files a/models/weapons/overkillbullet_reflect.tga and /dev/null differ diff --git a/qcsrc/common/animdecide.qh b/qcsrc/common/animdecide.qh index c2076d75f..578a30f68 100644 --- a/qcsrc/common/animdecide.qh +++ b/qcsrc/common/animdecide.qh @@ -17,7 +17,7 @@ CLASS(Animation, Object) if (f != -1) return f; }); #ifdef CSQC - LOG_WARNINGF("Missing animation for %s: %s\n", modelnameforindex(mdlidx), this.registered_id); + LOG_DEBUGF("Missing animation for %s: %s\n", modelnameforindex(mdlidx), this.registered_id); #endif return -1; } diff --git a/qcsrc/server/weapons/spawning.qc b/qcsrc/server/weapons/spawning.qc index c362913d4..cf78d0392 100644 --- a/qcsrc/server/weapons/spawning.qc +++ b/qcsrc/server/weapons/spawning.qc @@ -125,10 +125,7 @@ void weapon_defaultspawnfunc(entity this, Weapon e) if (e.spawnflags & WEP_FLAG_SUPERWEAPON) if (!this.superweapons_finished) - { this.superweapons_finished = autocvar_g_balance_superweapons_time; - LOG_INFO("Setting it to ", ftos(this.superweapons_finished), " on ", e.mdl, "\n"); - } // if we don't already have ammo, give us some ammo if (!this.(e.ammo_field)) diff --git a/textures/overkillbullet.tga b/textures/overkillbullet.tga new file mode 100644 index 000000000..f48d302fa Binary files /dev/null and b/textures/overkillbullet.tga differ diff --git a/textures/overkillbullet_gloss.tga b/textures/overkillbullet_gloss.tga new file mode 100644 index 000000000..08f2fd001 Binary files /dev/null and b/textures/overkillbullet_gloss.tga differ diff --git a/textures/overkillbullet_reflect.tga b/textures/overkillbullet_reflect.tga new file mode 100644 index 000000000..ecb0222e3 Binary files /dev/null and b/textures/overkillbullet_reflect.tga differ