From: terencehill Date: Sun, 5 Jan 2014 18:00:43 +0000 (+0100) Subject: Merge branch 'master' into terencehill/ca_ft_fixes X-Git-Tag: xonotic-v0.8.0~243^2~1^2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ace43a0b9fc339c80df65741952b07dd2bc5f52f;p=xonotic%2Fxonotic-data.pk3dir.git 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 --- ace43a0b9fc339c80df65741952b07dd2bc5f52f diff --cc qcsrc/server/g_world.qc index e7a3ad96c,42c2d7a8e..c51df593f --- a/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)