]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge remote branch 'origin/master' into mirceakitsune/event_chasecam
authorSamual <samual@xonotic.org>
Thu, 21 Apr 2011 01:27:22 +0000 (21:27 -0400)
committerSamual <samual@xonotic.org>
Thu, 21 Apr 2011 01:27:22 +0000 (21:27 -0400)
Conflicts:
defaultXonotic.cfg
qcsrc/client/View.qc

1  2 
defaultXonotic.cfg
qcsrc/client/View.qc

Simple merge
index 4a0d48686cdb68e37c3ea14badf1c2ae987ae820,1a1c37624d4aa66ec0cdd25825e7c2c062e213d4..7aa306aee90a65ba832429866df79a0fd44dd680
@@@ -366,8 -366,8 +366,10 @@@ vector myhealth_gentlergb
  float contentavgalpha, liquidalpha_prev;
  vector liquidcolor_prev;
  
 +float eventchase_current_distance;
 +
+ float checkfail[16];
  void CSQC_UpdateView(float w, float h)
  {
        entity e;