Merge branch 'master' into Mario/duel
authorMario <zacjardine@y7mail.com>
Fri, 21 Sep 2018 01:57:08 +0000 (11:57 +1000)
committerMario <zacjardine@y7mail.com>
Fri, 21 Sep 2018 01:57:08 +0000 (11:57 +1000)
1  2 
qcsrc/common/mapinfo.qc
qcsrc/server/bot/default/bot.qc
qcsrc/server/client.qc
qcsrc/server/client.qh
qcsrc/server/compat/quake3.qc
qcsrc/server/g_world.qc

Simple merge
@@@ -593,10 -593,7 +593,8 @@@ float bot_fixcount(
                });
        }
  
 +      //int player_limit = GetPlayerLimit(); // TODO: use this instead of maxclients!
        int bots;
-       // add/remove bots if needed to make sure there are at least
-       // minplayers+bot_number, or remove all bots if no one is playing
        // But don't remove bots immediately on level change, as the real players
        // usually haven't rejoined yet
        bots_would_leave = false;
Simple merge
Simple merge
Simple merge
Simple merge