Merge branch 'master' into Mario/monsters

diff --combined defaultXonotic.cfg
index 45dee79d8d7ed5d99201437708f4d199644d93ca,d967d53d555dee2e8dd5f98b46f4c98f8ff1d9d1..3e7fa208bb972e9a46215c6ea9479051212f7673
--- 1/defaultXonotic.cfg
--- 2/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@@ -93,11 -93,14 +93,14 @@@ vid_fullscreen 
  vid_width 1024
  vid_height 768
  vid_pixelheight 1
+ vid_resizable 0 // cannot be turned on before it is sure it cannot cause a r_restart
+ vid_desktopfullscreen 1
  prvm_language en
  set _menu_prvm_language ""
  set _menu_vid_width "$vid_width"
  set _menu_vid_height "$vid_height"
  set _menu_vid_pixelheight "$vid_pixelheight"
+ set _menu_vid_desktopfullscreen "$vid_desktopfullscreen"
  seta menu_vid_scale 0
  seta menu_vid_allowdualscreenresolution 0
  // 2D resolution 800x600
@@@ -452,10 -455,6 +455,10 @@@ seta menu_sandbox_edit_material "
  
  bind f7 menu_showsandboxtools
  
 +seta menu_monsters_edit_spawn ""
 +seta menu_monsters_edit_skin 0
 +seta menu_monsters_edit_movetarget 1
 +
  set g_playerclip_collisions 1 "0 = disable collision testing against playerclips, might be useful on some defrag maps"
  set g_botclip_collisions 1 "0 = disable collision testing against botclips, might be useful on some defrag maps"
  
@@@ -1541,7 -1540,6 +1544,7 @@@ exec crosshairs.cf
  exec gamemodes.cfg
  exec mutators.cfg
  exec notifications.cfg
 +exec monsters.cfg
  
  // load console command aliases and settings
  exec commands.cfg