Merge branch 'martin-t/vbots' into 'master'

Add bots, nobots, document new bot skill

See merge request xonotic/xonotic!52

diff --combined server/server.cfg
index b7185fe549caacde38344a39389ce5350fb94d36,ffe3001bfbdf99c2d484d957a09d31d401624336..ab835ccddedb728e7e2b2311930e13f2f60d1a78
--- 1/server/server.cfg
--- 2/server/server.cfg
+++ b/server/server.cfg
@@@ -77,9 -77,13 +77,13 @@@
  // Some settings you MIGHT want to change.  Again IF so remove the //
  // from the line start and change them to your liking.
  
- //skill 4     // the bots skill level
+ //skill 8     // the bots skill level
+ 
+ // if changing either of these two minplayers settigs, you should consider editing the `bots` alias so that the `bots` vote adds the right number of bots
  //minplayers 0        // add bots if less then that number of players playing
  //minplayers_per_team 0 // add bots to each team if less than that number of players playing
+ //alias bots "minplayers 4; minplayers_per_team 2"
+ 
  //g_maxplayers 0 // above this player count, only allow spectators
  //bot_prefix [BOT]    // prepend this to all botnames
  //bot_suffix ""       // append this to all botnames
@@@ -97,7 -101,7 +101,7 @@@ sv_vote_gametype 1          // set to 1 to en
  //set sv_vote_gametype_mycustom_description "This is my custom gametype"      // the description for the custom gametype
  // Custom icons for custom gametypes are supported and have to be located in a server pk3 as gfx/menu/default/gametype_mycustom
  
- //sv_vote_commands "restart fraglimit chmap gotomap nextmap endmatch reducematchtime extendmatchtime allready kick cointoss movetoauto shuffleteams"  // players can vote for those commands or use them if they are masters. You canm also add 'g_grappling_hook' for hook voting, and 'sv_fbskin_green sv_fbskin_red sv_fbskin_orange sv_fbskin_off' for fbskin voting.
+ //sv_vote_commands "restart fraglimit chmap gotomap nextmap endmatch reducematchtime extendmatchtime allready kick cointoss movetoauto shuffleteams bots nobots"      // players can vote for those commands or use them if they are masters. You can also add 'g_grappling_hook' for hook voting, and 'sv_fbskin_green sv_fbskin_red sv_fbskin_orange sv_fbskin_off' for fbskin voting.
  //sv_vote_master_commands "movetored movetoblue movetoyellow movetopink"      // add commands masters can use if logged in or elected. You may want to put 'kickban' here, so masters can keep out punks. It may be good to also put "sv_status_privacy 0" then...
  //rcon_restricted_commands "restart fraglimit chmap gotomap endmatch reducematchtime extendmatchtime allready kick kickban \"sv_cmd bans\" \"sv_cmd unban\" status \"sv_cmd teamstatus\" movetoauto movetored movetoblue movetoyellow movetopink"     // commands for the (stronger) rcon restricted
  //rcon_restricted_password "" // put here the password for a "restricted" rcon user (see below)
@@@ -210,6 -214,7 +214,6 @@@ sv_weaponstats_file "http://www.xonotic
  // Overkill mod settings
  
  // To enable Overkill, put 'exec ruleset-overkill.cfg' at the top of this file (above any other cvar changes), don't use 'g_overkill 1' directly.
 -// You should also consider enabling 'g_fullbrightplayers 1'.