Merge remote branch 'origin/master' into terencehill/menu_tooltips_2

diff --combined defaultXonotic.cfg
index 02ddde8b0f4fc046d5fd6dcbc9b71b7da91b6d78,9430c6ff6aae65308f984bb117d83d3c70d6d1d7..a0d50e3e7a996bf234d765d634097f23d5b2357e
--- 1/defaultXonotic.cfg
--- 2/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@@ -1410,7 -1410,6 +1410,7 @@@ seta slowmo 
  seta menu_skin "luminos"
  set menu_slowmo 1
  seta menu_sounds 0 "enables menu sound effects. 1 enables click sounds, 2 also enables hover sounds"
 +seta menu_tooltips 1 "menu tooltips: 0 disabled, 1 enabled, 2 also shows cvar or console command (when available) changed or executed by the item"
  set menu_picmip_bypass 0 "bypass texture quality enforcement based on system resources, not recommended and may cause crashes!"
  
  r_textbrightness 0.2
@@@ -1996,6 -1995,9 +1996,9 @@@ set _origin "0 0 0
  set _campaign_index ""
  set _campaign_name ""
  
+ // debug
+ set _independent_players 0 "DO NOT TOUCH"
+ 
  // define some engine cvars that we need even on dedicated server
  set r_showbboxes 0