Merge branch 'master' into Mario/team_keepaway

diff --cc gamemodes-server.cfg
Simple merge

diff --cc qcsrc/common/scores.qh
Simple merge

diff --cc qcsrc/common/stats.qh
index ce1bed536110d515590e257b38dafec0deb6fa90,e5621c29ec97ecc80a2ef740ba4061aaec48aa77..41c851654c431aede83d55bb5f20b7e54ecb675a
--- 1/qcsrc/common/stats.qh
--- 2/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)
  

diff --cc qcsrc/server/world.qc
Simple merge