Merge remote branch 'origin/master' into mirceakitsune/event_chasecam

Conflicts:
	defaultXonotic.cfg
	qcsrc/client/View.qc

diff --cc defaultXonotic.cfg
Simple merge

diff --cc qcsrc/client/View.qc
index 4a0d48686cdb68e37c3ea14badf1c2ae987ae820,1a1c37624d4aa66ec0cdd25825e7c2c062e213d4..7aa306aee90a65ba832429866df79a0fd44dd680
--- 1/qcsrc/client/View.qc
--- 2/qcsrc/client/View.qc
+++ b/qcsrc/client/View.qc
@@@ -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;