Merge branch 'master' into Mario/ctf_updates
authorMario <zacjardine@y7mail.com>
Mon, 27 Jul 2015 14:45:58 +0000 (00:45 +1000)
committerMario <zacjardine@y7mail.com>
Mon, 27 Jul 2015 14:45:58 +0000 (00:45 +1000)
# Conflicts:
# qcsrc/common/stats.qh
# qcsrc/server/mutators/gamemode_ctf.qc
# qcsrc/server/mutators/gamemode_ctf.qh

1  2 
gamemodes.cfg
qcsrc/client/waypointsprites.qc
qcsrc/common/stats.qh
qcsrc/server/autocvars.qh
qcsrc/server/mutators/gamemode_ctf.qh

diff --cc gamemodes.cfg
Simple merge
Simple merge
@@@ -107,8 -107,8 +107,9 @@@ const int STAT_HEALING_ORB_ALPHA      
  const int STAT_PLASMA                 = 84;
  const int STAT_OK_AMMO_CHARGE         = 85;
  const int STAT_OK_AMMO_CHARGEPOOL     = 86;
 -const int STAT_FROZEN                 = 87;
 -const int STAT_REVIVE_PROGRESS        = 88;
 +const int STAT_CTF_FLAGSTATUS         = 87;
- // 88 empty?
++const int STAT_FROZEN                 = 88;
++const int STAT_REVIVE_PROGRESS        = 89;
  // 89 empty?
  // 90 empty?
  // 91 empty?
Simple merge
Simple merge