Merge branch 'master' into martin-t/deglob-log

diff --combined xonotic-common.cfg
index c77087d68ffb6541da2e390d04f521aa6d129b52,4fd0ee0c1488965a1eae4bd06164ab018a710b4e..7a2c4611ad2ce287500b5cf3aa91827621f7c4ca
--- 1/xonotic-common.cfg
--- 2/xonotic-common.cfg
+++ b/xonotic-common.cfg
@@@ -48,7 -48,7 +48,7 @@@ fs_empty_files_in_pack_mark_deletions 
  set g_campaign 0
  set g_campaign_forceteam 0 "Forces the player to a given team in campaign mode, 1 = red, 2 = blue, 3 = yellow, 4 = pink"
  seta g_campaign_name "xonoticbeta"
- seta g_campaign_skill -1 // -2 easy -1 medium 0 hard
+ seta g_campaign_skill 0 // -2 easy, 0 medium, 2 hard
  
  alias singleplayer_start "g_campaign_index 0; set scmenu_campaign_goto 0"
  alias singleplayer_continue "set scmenu_campaign_goto -1"
@@@ -144,9 -144,6 +144,9 @@@ seta snd_channel9volume 1 "QuakeC contr
  snd_identicalsoundrandomization_time -0.1
  snd_identicalsoundrandomization_tics    1
  
 +set debug_deglobalization_logging 0 "bitfield: 1 logs usage of the old functions which use globals implicitly, 2 logs usage of the new wrappers; support for this can be disabled at compile time for better performance"
 +set debug_deglobalization_clear 0 "make the new wrappers set globals to NaN after use, this helps find bugs but can result in crashes; support for this can be disabled at compile time for better performance"
 +
  // load console command aliases and settings
  exec commands.cfg