]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Fix some minor annoyances
authorMario <mario@smbclan.net>
Thu, 10 Dec 2015 22:35:12 +0000 (08:35 +1000)
committerMario <mario@smbclan.net>
Thu, 10 Dec 2015 22:35:12 +0000 (08:35 +1000)
models/ok_nade_counter/ok_nade_counter.md3_9.skin
models/weapons/overkillbullet.tga [deleted file]
models/weapons/overkillbullet_gloss.tga [deleted file]
models/weapons/overkillbullet_reflect.tga [deleted file]
qcsrc/common/animdecide.qh
qcsrc/server/weapons/spawning.qc
textures/overkillbullet.tga [new file with mode: 0644]
textures/overkillbullet_gloss.tga [new file with mode: 0644]
textures/overkillbullet_reflect.tga [new file with mode: 0644]

index 1402b7a0b02b77868ad4054ef7e0a44149a2bae7..e3df814e3618570e7f44577d33e2c5ef805fcdc8 100644 (file)
@@ -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 (file)
index f48d302..0000000
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 (file)
index 08f2fd0..0000000
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 (file)
index ecb0222..0000000
Binary files a/models/weapons/overkillbullet_reflect.tga and /dev/null differ
index c2076d75f42aa7e7117037bd4e2be5f8cb921721..578a30f68bccab793dbadf9e6e8b956be4dc677e 100644 (file)
@@ -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;
        }
index c362913d45aa3cc8f2039640b39d62c791204ba0..cf78d039240367ae6f048929caaccab42a0a5342 100644 (file)
@@ -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 (file)
index 0000000..f48d302
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 (file)
index 0000000..08f2fd0
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 (file)
index 0000000..ecb0222
Binary files /dev/null and b/textures/overkillbullet_reflect.tga differ