Merge branch 'master' into Mario/ctf_updates
authorMario <zacjardine@y7mail.com>
Sat, 6 Dec 2014 02:50:10 +0000 (13:50 +1100)
committerMario <zacjardine@y7mail.com>
Sat, 6 Dec 2014 02:50:10 +0000 (13:50 +1100)
Conflicts:
qcsrc/server/mutators/gamemode_ctf.qc

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

diff --cc gamemodes.cfg
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -1053,8 -930,7 +1053,9 @@@ void ctf_RespawnFlag(entity flag
        flag.ctf_dropper = world;
        flag.ctf_pickuptime = 0;
        flag.ctf_droptime = 0;
-       
 +      flag.ctf_flagdamaged = 0;
++
        ctf_CheckStalemate();
  }