]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0bb6774 396be1f)
Merge branch 'master' into mirceakitsune/event_chasecam
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Tue, 19 Apr 2011 21:55:10 +0000 (00:55 +0300)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Tue, 19 Apr 2011 21:55:10 +0000 (00:55 +0300)
1  2 
defaultXonotic.cfg patch | diff1 | diff2 | blob | history
qcsrc/client/View.qc patch | diff1 | diff2 | blob | history

diff --cc defaultXonotic.cfg
Simple merge
diff --cc qcsrc/client/View.qc
index ce78cbbc60ca1adfdbb785a8c3852bc475aa92de,1a1c37624d4aa66ec0cdd25825e7c2c062e213d4..71a4429efb7a9213397fcfe14a86a5a2d3be5392
--- 1/qcsrc/client/View.qc
--- 2/qcsrc/client/View.qc
+++ b/qcsrc/client/View.qc
@@@ -366,7 -366,7 +366,8 @@@ vector myhealth_gentlergb
  float contentavgalpha, liquidalpha_prev;
  vector liquidcolor_prev;
  
 +float eventchase_current_distance;
+ float checkfail[16];
  
  void CSQC_UpdateView(float w, float h)
  {