Merge branch 'master' into terencehill/ca_ft_fixes
authorterencehill <piuntn@gmail.com>
Sun, 5 Jan 2014 18:00:43 +0000 (19:00 +0100)
committerterencehill <piuntn@gmail.com>
Sun, 5 Jan 2014 18:00:43 +0000 (19:00 +0100)
Conflicts:
gamemodes.cfg
qcsrc/server/g_world.qc
qcsrc/server/mutators/gamemode_arena.qc
qcsrc/server/mutators/gamemode_ca.qc

1  2 
gamemodes.cfg
qcsrc/server/autocvars.qh
qcsrc/server/cl_impulse.qc
qcsrc/server/g_world.qc
qcsrc/server/mutators/gamemode_ca.qc
qcsrc/server/mutators/gamemode_freezetag.qc
qcsrc/server/mutators/gamemode_lms.qc
qcsrc/server/scores_rules.qc
qcsrc/server/teamplay.qc

diff --cc gamemodes.cfg
Simple merge
Simple merge
Simple merge
@@@ -1863,7 -1853,7 +1853,7 @@@ float WinningCondition_Scores(float lim
        if(WinningConditionHelper_zeroisworst)
                leadlimit = 0; // not supported in this mode
  
-       if(g_dm || g_tdm || g_arena || g_ca || g_freezetag || (g_race && !g_race_qualifying) || g_nexball)
 -      if(g_dm || g_tdm || g_ca || (g_race && !g_race_qualifying) || g_nexball)
++      if(g_dm || g_tdm || g_ca || g_freezetag || (g_race && !g_race_qualifying) || g_nexball)
        // these modes always score in increments of 1, thus this makes sense
        {
                if(leaderfrags != WinningConditionHelper_topscore)
Simple merge
Simple merge
Simple merge
Simple merge