From: Mario <mario.mario@y7mail.com>
Date: Tue, 1 Jun 2021 06:31:14 +0000 (+1000)
Subject: Merge branch 'master' into Mario/team_keepaway
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=41907656d4665e3fac19b8fc1756868afefc5690;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Mario/team_keepaway
---

41907656d4665e3fac19b8fc1756868afefc5690
diff --cc qcsrc/common/stats.qh
index ce1bed5361,e5621c29ec..41c851654c
--- a/qcsrc/common/stats.qh
+++ b/qcsrc/common/stats.qh
@@@ -138,10 -138,9 +138,10 @@@ REGISTER_STAT(ITEMSTIME, int, autocvar_
  REGISTER_STAT(KILL_TIME, float)
  REGISTER_STAT(VEIL_ORB, float)
  REGISTER_STAT(VEIL_ORB_ALPHA, float)
 +REGISTER_STAT(TKA_BALLSTATUS, int)
  
  #ifdef SVQC
- float autocvar_sv_showfps = 5;
+ float autocvar_sv_showfps = 0;
  #endif
  REGISTER_STAT(SHOWFPS, float, autocvar_sv_showfps)