Merge branch 'master' into mirceakitsune/hud_postprocessing

diff --cc defaultXonotic.cfg
Simple merge

diff --cc qcsrc/client/View.qc
index 732346acef5d6ce67fb61d0f6c455639af62f0fa,0da6406195bc955b32298dc81dd9c385e2fdebf3..c9b16160f1613c0cca639d898d646571056d94e9
--- 1/qcsrc/client/View.qc
--- 2/qcsrc/client/View.qc
+++ b/qcsrc/client/View.qc
@@@ -369,7 -366,8 +369,10 @@@ vector myhealth_gentlergb
  float contentavgalpha, liquidalpha_prev;
  vector liquidcolor_prev;
  
+ float eventchase_current_distance;
+ 
 +vector damage_blurpostprocess, content_blurpostprocess;
++
  float checkfail[16];
  
  void CSQC_UpdateView(float w, float h)

diff --cc qcsrc/client/autocvars.qh
Simple merge