Merge branch 'master' into mirceakitsune/hud_postprocessing

diff --cc defaultXonotic.cfg
Simple merge

diff --cc qcsrc/client/View.qc
index 8a862f5d77fbab730f58f25cb56a47500eb48e1a,870da0d7b04824cfb8dafa007dcc4a62f65d1f62..1dfa1b359b9d65cfa4d63f5ee90c187644d0826b
--- 1/qcsrc/client/View.qc
--- 2/qcsrc/client/View.qc
+++ b/qcsrc/client/View.qc
@@@ -766,28 -754,12 +759,28 @@@ void CSQC_UpdateView(float w, float h
                }
                else
                        contentfadetime = autocvar_hud_contents_fadeouttime;
-                       
+ 
                contentalpha_temp = bound(0, drawframetime / max(0.0001, contentfadetime), 1);
                contentavgalpha = contentavgalpha * (1 - contentalpha_temp) + incontent * contentalpha_temp;
-               
+ 
                if(contentavgalpha)
                        drawfill('0 0 0', eX * vid_conwidth + eY * vid_conheight, liquidcolor_prev, contentavgalpha * liquidalpha_prev, DRAWFLAG_NORMAL);
 +
 +              if(autocvar_hud_postprocessing)
 +              {
 +                      if(autocvar_hud_contents_blur && contentavgalpha)
 +                      {
 +                              content_blurpostprocess_x = 1;
 +                              content_blurpostprocess_y = contentavgalpha * autocvar_hud_contents_blur;
 +                              content_blurpostprocess_z = contentavgalpha * autocvar_hud_contents_blur_alpha;
 +                      }
 +                      else
 +                      {
 +                              content_blurpostprocess_x = 0;
 +                              content_blurpostprocess_y = 0;
 +                              content_blurpostprocess_z = 0;
 +                      }
 +              }
        }
        
        if(autocvar_hud_damage && !autocvar_chase_active)

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