Merge remote branch 'origin/master' into samual/hud_updates

diff --combined defaultXonotic.cfg
index 0ef845fa4a53014408f83f20c122b5672659fcee,61053459417f55f75e0477372c14ebda10d50e24..9248a5174e59aa22713faf4e1f184012c2015858
--- 1/defaultXonotic.cfg
--- 2/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@@ -367,10 -367,10 +367,10 @@@ set g_respawn_ghosts_maxtime 6 "maximu
  set sv_gibhealth 100 "Minus health a dead body must have in order to get gibbed"
  
  // fragmessage: This allows extra information to be displayed with the frag centerprints. 
 -set sv_fragmessage_information_ping 1 "Enable ping display information, 0 = Never display; 1 = Always display (If the player is a bot, it will say bot instead of the ping.)"
 -set sv_fragmessage_information_handicap 1 "Enable handicap display information, 0 = Never display; 1 = Only when the player has handicap on; 2 = Always display (Displays Off if off)"
 -set sv_fragmessage_information_stats 1 "Enable statistics (health/armor) display information, 0 = Never display; 1 = Always display (Only available for the person who was killed)"
 -set sv_fragmessage_information_typefrag 1 "Enable typefrag display information, 0 = Never display; 1 = Always display"
 +set sv_fraginfo_ping 1 "Enable ping display information, 0 = Never display; 1 = Always display (If the player is a bot, it will say bot instead of the ping.)"
 +set sv_fraginfo_handicap 1 "Enable handicap display information, 0 = Never display; 1 = Only when the player has handicap on; 2 = Always display (Displays Off if off)"
 +set sv_fraginfo_stats 1 "Enable statistics (health/armor) display information, 0 = Never display; 1 = Always display (Only available for the person who was killed)"
 +set sv_fraginfo_typefrag 1 "Enable typefrag display information, 0 = Never display; 1 = Always display"
  
  // use default physics
  set sv_friction_on_land 0
@@@ -2165,6 -2165,10 +2165,10 @@@ set snd_soundradius 120
  seta snd_channel8volume 1 "QuakeC controlled background music volume"
  seta snd_channel9volume 1 "QuakeC controlled ambient sound volume"
  
+ // sound randomization
+ snd_identicalsoundrandomization_time -0.1
+ snd_identicalsoundrandomization_tics    1
+ 
  // loading screen
  scr_loadingscreen_background 0
  scr_loadingscreen_barcolor "0 0.5 1"