From: Mario Date: Sun, 12 Mar 2017 03:13:00 +0000 (+1000) Subject: Merge branch 'master' into Mario/killsound X-Git-Tag: xonotic-v0.8.2~69^2~2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=905ec2fbd2b610eeb2591cdddbf71ce24b7bb3ab;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' into Mario/killsound --- 905ec2fbd2b610eeb2591cdddbf71ce24b7bb3ab diff --cc qcsrc/common/stats.qh index edfa47fd4,afde74324..44efee885 --- a/qcsrc/common/stats.qh +++ b/qcsrc/common/stats.qh @@@ -126,8 -118,12 +118,13 @@@ REGISTER_STAT(CAPTURE_PROGRESS, float REGISTER_STAT(ENTRAP_ORB, float) REGISTER_STAT(ENTRAP_ORB_ALPHA, float) REGISTER_STAT(ITEMSTIME, int, autocvar_sv_itemstime) +REGISTER_STAT(KILL_TIME, float) + #ifdef SVQC + bool autocvar_g_ctf_leaderboard; + #endif + REGISTER_STAT(CTF_SHOWLEADERBOARD, bool, autocvar_g_ctf_leaderboard) + #ifdef SVQC int autocvar_g_multijump; float autocvar_g_multijump_add;