Merge branch 'master' into mirceakitsune/rendering_tweaks

diff --combined defaultXonotic.cfg
index b969dc8f38c4c9d52dd1b13e8e23491f754b2063,0a96bbac13c63033c8a9432f14cd826ca1a5270e..3e0090668663fde5140d1bd24c56351fbd485e1c
--- 1/defaultXonotic.cfg
--- 2/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@@ -286,8 -286,8 +286,8 @@@ r_damageblur 0 // motion blur when dama
  
  r_bloom_blur 24
  r_bloom_brighten 2
- r_bloom_colorexponent 1.5
- r_bloom_colorscale 1.5
+ r_bloom_colorexponent 1
+ r_bloom_colorscale 1
  r_bloom_colorsubtract 0.15
  r_bloom_resolution 320
  r_hdr_range 4
@@@ -2088,7 -2088,6 +2088,7 @@@ sv_clmovement_inputtimeout 0.07 // mor
  
  // exact gloss looks better, e.g. on g-23
  r_shadow_glossexact 1
 +r_shadow_glossintensity 3
  
  // use fake light if map has no lightmaps
  r_fakelight 1