Merge branch 'master' into martin-t/AMMO

diff --combined xonotic-server.cfg
index 59a455b6a3cf20d4dcce8282c5c2f3de34fd3942,f914a7b11e3bafdae0391c329811d081c8aee130..13f790714f96ecaa413cc4f0af9f0f293576c7a8
--- 1/xonotic-server.cfg
--- 2/xonotic-server.cfg
+++ b/xonotic-server.cfg
@@@ -190,7 -190,7 +190,7 @@@ set g_pinata 0 "if set to 1 you will no
  set g_weapon_stay 0 "1: ghost weapons can be picked up too but give no ammo, 2: ghost weapons refill ammo to one pickup size, thrown guns have no ammo"
  set g_weapon_throwable 1 "if set to 1, weapons can be dropped"
  set g_powerups -1 "if set to 0 the strength and shield (invincibility) will not spawn on the map, if 1 they will spawn in all game modes, -1 is game mode default"
 -set g_use_ammunition 1 "if set to 0 all weapons have unlimited ammunition"
 +set g_use_ammunition 1 "if set to 0 all weapons have unlimited ammo"
  set g_pickup_items -1 "if set to 0 all items (health, armor, ammo, weapons...) are removed from the map, if 1 they are forced to spawn"
  set g_pickup_respawntime_scaling_reciprocal 0 "Multiply respawn time by `reciprocal / (p + offset) + linear` where `p` is the current number of players, takes effect with 2 or more players present, `reciprocal` (with `offset` and `linear` set to 0) can be used to achieve a constant number of items spawned *per player*"
  set g_pickup_respawntime_scaling_offset 0 "Multiply respawn time by `reciprocal / (p + offset) + linear` where `p` is the current number of players, takes effect with 2 or more players present, `offset` offsets the curve left or right - the results are not intuitive and I recommend plotting the respawn time and the number of items per player to see what's happening"
@@@ -213,6 -213,7 +213,7 @@@ set g_maplist_selectrandom 0       "if 1, a r
  set g_maplist_shuffle 1       "new randomization method: like selectrandom, but avoid playing the same maps in short succession. This works by taking out the first element and inserting it into g_maplist with a bias to the end of the list"
  set g_maplist_check_waypoints 0       "when 1, maps are skipped if there currently are bots, but the map has no waypoints"
  set g_maplist_ignore_sizes 0 "when 1, all maps are shown in the map list regardless of player count"
+ set g_maplist_sizes_count_bots 1 "include the number of bots currently in the server when counting the number of players for size restrictions"
  
  set g_items_mindist 4000 "starting distance for the fading of items"
  set g_items_maxdist 4500 "maximum distance at which an item can be viewed, after which it will be invisible"