Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir

diff --combined qcsrc/server/g_world.qc
index 29ebeb31530bd0a402059ede08517fbeaeb63c94,f72d32236ffd880a0ba47ed3c6e919bf3846689a..9a3c3614a25de91e4bab9259f6e5e142431c12cb
--- 1/qcsrc/server/g_world.qc
--- 2/qcsrc/server/g_world.qc
+++ b/qcsrc/server/g_world.qc
@@@ -329,6 -329,7 +329,7 @@@ void cvar_changes_init(
                BADCVAR("g_runematch");
                BADCVAR("g_tdm");
                BADCVAR("g_nexball");
+               BADCVAR("g_keepaway");
                BADCVAR("teamplay");
  
                // long
@@@ -809,11 -810,19 +810,19 @@@ void spawnfunc_worldspawn (void
        addstat(STAT_NEX_CHARGE, AS_FLOAT, nex_charge);
        addstat(STAT_NEX_CHARGEPOOL, AS_FLOAT, nex_charge_pool_ammo);
  
-       if(g_ca)
+       if(g_ca || g_freezetag)
        {
                addstat(STAT_REDALIVE, AS_INT, redalive_stat);
                addstat(STAT_BLUEALIVE, AS_INT, bluealive_stat);
+               addstat(STAT_YELLOWALIVE, AS_INT, yellowalive_stat);
+               addstat(STAT_PINKALIVE, AS_INT, pinkalive_stat);
        }
+       if(g_freezetag)
+       {
+               addstat(STAT_FROZEN, AS_INT, freezetag_frozen);
+               addstat(STAT_REVIVE_PROGRESS, AS_FLOAT, freezetag_revive_progress);
+       }
+ 
        // g_movementspeed hack
        addstat(STAT_MOVEVARS_AIRSPEEDLIMIT_NONQW, AS_FLOAT, stat_sv_airspeedlimit_nonqw);
        addstat(STAT_MOVEVARS_MAXSPEED, AS_FLOAT, stat_sv_maxspeed);
@@@ -2727,7 -2736,7 +2736,7 @@@ void MapVote_Start(
                return;
  
        // wait for stats to be sent first
 -      if(!playerstats_sent)
 +      if(!playerstats_waitforme)
                return;
  
        MapInfo_Enumerate();