Merge branch 'master' into mirceakitsune/new_loading_screens

diff --combined defaultXonotic.cfg
index b2607dc977923c61d05948c809a7d91977440d7d,7a7daae6d279ba96c99ba32241d08ea6d0ba8721..00b7fe999d3b6ca65f88f1f4c1718d5ed7127302
--- 1/defaultXonotic.cfg
--- 2/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@@ -205,6 -205,9 +205,9 @@@ seta crosshair_ring_nex_currentcharge_m
  seta crosshair_ring_minelayer 1
  seta crosshair_ring_minelayer_alpha 0.15
  
+ seta crosshair_ring_hagar 1
+ seta crosshair_ring_hagar_alpha 0.15
+ 
  seta crosshair_ring_reload 1 "main cvar to enable or disable ammo crosshair rings"
  seta crosshair_ring_reload_size 2.5   "reload ring size"
  seta crosshair_ring_reload_alpha 0.2  "reload ring alpha"
@@@ -2018,6 -2021,10 +2021,6 @@@ scr_conscroll3_y 
  scr_conscroll_x -0.1
  scr_conscroll_y -0.3
  
 -scr_loadingscreen_background 0
 -scr_loadingscreen_barcolor "0 0.5 1"
 -scr_loadingscreen_barheight 12
 -scr_loadingscreen_count 1
  scr_conforcewhiledisconnected 0
  scr_infobar_height 12
  
@@@ -2106,13 -2113,9 +2109,13 @@@ set g_playerstats_debug 0 "when 1, play
  set snd_soundradius 1200
  
  // loading screen
 -scr_loadingscreen_scale 1
 +scr_loadingscreen_background 0
 +scr_loadingscreen_barcolor "0 0.5 1"
 +scr_loadingscreen_barheight 12
 +scr_loadingscreen_count 12
 +scr_loadingscreen_scale 999
  scr_loadingscreen_scale_base 1
 -scr_loadingscreen_scale_limit 1
 +scr_loadingscreen_scale_limit 2
  
  // sRGB configuration (EXPERIMENTAL, needs maps to be relit)
  alias sRGBcorrect_on  "r_texture_sRGB_skin_diffuse 1;r_texture_sRGB_skin_gloss 1;r_texture_sRGB_skin_glow 1;r_texture_sRGB_reflect 1;r_texture_sRGB_skybox 1;v_gamma 2.2;r_restart"