Merge branch 'master' into Mario/killsound
authorMario <mario@smbclan.net>
Sun, 12 Mar 2017 03:13:00 +0000 (13:13 +1000)
committerMario <mario@smbclan.net>
Sun, 12 Mar 2017 03:13:00 +0000 (13:13 +1000)
1  2 
qcsrc/client/view.qc
qcsrc/common/stats.qh
qcsrc/server/defs.qh
qcsrc/server/g_damage.qc
qcsrc/server/g_world.qc

Simple merge
@@@ -126,9 -118,13 +118,14 @@@ 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;
  float autocvar_g_multijump_speed;
Simple merge
Simple merge
Simple merge