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

Add bots and nobots votes, set default bot skill to 8 (from 1)

See merge request xonotic/xonotic-data.pk3dir!668

diff --combined xonotic-server.cfg
index d3378967a6ae5dde48331d50f1743ed701bd0bd5,34c3ff9e3842a2e27fef925ab5ab97f262d403cd..d17ba5c3118b58937cfa8f51982379bafd74067c
--- 1/xonotic-server.cfg
--- 2/xonotic-server.cfg
+++ b/xonotic-server.cfg
@@@ -114,6 -114,7 +114,7 @@@ set bot_usemodelnames 0    "Use player mod
  set bot_nofire 0      "When set, bots never fire. Mainly for testing in g_waypointeditor mode"
  set bot_prefix [BOT]  "Prefix in front of the bot names"
  set bot_suffix ""     "Suffix behind the bot names"
+ skill 8
  set skill_auto 0      "when 1, \"skill\" gets adjusted to match the best player on the map"
  set bot_debug_tracewalk 0 "Enable visual indicators for short-term navigation. Green: Goal Reached / Yellow: Obstacle found / Red: Unsolvable obstacle found"
  set bot_debug_goalstack 0 "Visualize the current path that each bot is following. Use with as few bots as possible."
@@@ -565,4 -566,3 +566,4 @@@ set sv_showspectators 1 "Show who's spe
  set sv_damagetext 2 "<= 0: disabled, >= 1: visible to spectators, >= 2: visible to attacker, >= 3: all players see everyone's damage"
  
  set sv_showfps 5 "Show player's FPS counters in the scoreboard. This setting acts as a delay in seconds between updates"
 +set autocvar_sv_doors_always_open 0 "If set to 1 don't close doors which after they were open"