From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Sun, 1 May 2011 12:53:21 +0000 (+0300)
Subject: Merge branch 'master' into mirceakitsune/hud_postprocessing
X-Git-Tag: xonotic-v0.5.0~173^2~3^2~12
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0d0b13723b0c7272249d216feabf5100fd8442ae;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into mirceakitsune/hud_postprocessing
---

0d0b13723b0c7272249d216feabf5100fd8442ae
diff --cc qcsrc/client/View.qc
index 732346ace,0da640619..c9b16160f
--- a/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)