Merge branch 'master' into mirceakitsune/hud_postprocessing

diff --cc defaultXonotic.cfg
Simple merge

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