Merge branch 'master' into mirceakitsune/hud_postprocessing
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Sun, 1 May 2011 12:53:21 +0000 (15:53 +0300)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Sun, 1 May 2011 12:53:21 +0000 (15:53 +0300)
1  2 
defaultXonotic.cfg
qcsrc/client/View.qc
qcsrc/client/autocvars.qh

Simple merge
@@@ -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)
Simple merge