Merge branch 'master' into terencehill/ca_ft_fixes

Conflicts:
	gamemodes.cfg
	qcsrc/server/g_world.qc
	qcsrc/server/mutators/gamemode_arena.qc
	qcsrc/server/mutators/gamemode_ca.qc

diff --cc gamemodes.cfg
Simple merge

diff --cc qcsrc/server/autocvars.qh
Simple merge

diff --cc qcsrc/server/cl_impulse.qc
Simple merge

diff --cc qcsrc/server/g_world.qc
index e7a3ad96cc0997be032fd1a3de40d4245dd87f3d,42c2d7a8e4e74cad37e0a1cacc88f0b74361fd6e..c51df593f0fd0eced190c73926e0089704b2d6ca
--- 1/qcsrc/server/g_world.qc
--- 2/qcsrc/server/g_world.qc
+++ b/qcsrc/server/g_world.qc
@@@ -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)

diff --cc qcsrc/server/mutators/gamemode_ca.qc
Simple merge

diff --cc qcsrc/server/mutators/gamemode_freezetag.qc
Simple merge

diff --cc qcsrc/server/mutators/gamemode_lms.qc
Simple merge

diff --cc qcsrc/server/scores_rules.qc
Simple merge

diff --cc qcsrc/server/teamplay.qc
Simple merge