Merge branch 'master' into Mario/survival

diff --combined qcsrc/common/stats.qh
index 077767f2d4bc8acdbea3a390b041818d77a9c14c,812f3e92d77e128a12775507d011b616bf250a40..f43b451dfd5aa0953be1981158c7ade14c4fbec8
--- 1/qcsrc/common/stats.qh
--- 2/qcsrc/common/stats.qh
+++ b/qcsrc/common/stats.qh
@@@ -125,19 -125,13 +125,13 @@@ REGISTER_STAT(MONSTERS_KILLED, int
  REGISTER_STAT(NADE_BONUS, float)
  REGISTER_STAT(NADE_BONUS_TYPE, int)
  REGISTER_STAT(NADE_BONUS_SCORE, float)
- REGISTER_STAT(HEALING_ORB, float)
- REGISTER_STAT(HEALING_ORB_ALPHA, float)
  REGISTER_STAT(PLASMA, int)
  REGISTER_STAT(FROZEN, int)
  REGISTER_STAT(REVIVE_PROGRESS, float)
  REGISTER_STAT(ROUNDLOST, int)
  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)
- REGISTER_STAT(VEIL_ORB, float)
- REGISTER_STAT(VEIL_ORB_ALPHA, float)
  
  #ifdef SVQC
  float autocvar_sv_showfps = 0;
@@@ -439,5 -433,3 +433,5 @@@ REGISTER_STAT(GUNALIGN, int
  #ifdef SVQC
  SPECTATE_COPYFIELD(_STAT(GUNALIGN))
  #endif
 +
 +REGISTER_STAT(SURVIVAL_ROUNDTIMER, float)