From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Tue, 10 May 2011 23:09:07 +0000 (+0300)
Subject: Merge branch 'master' into mirceakitsune/damage_effects
X-Git-Tag: xonotic-v0.6.0~110^2^2~104
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d6d052a48359a46ac57774650797e6cc6a6d7f31;p=xonotic%2Fxonotic-data.pk3dir.git

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

d6d052a48359a46ac57774650797e6cc6a6d7f31
diff --cc qcsrc/client/autocvars.qh
index 8f8414464,6d157405b..e4c317074
--- a/qcsrc/client/autocvars.qh
+++ b/qcsrc/client/autocvars.qh
@@@ -305,5 -305,7 +305,9 @@@ float autocvar_viewsize
  float autocvar_crosshair_color_by_health;
  float autocvar_cl_hitsound;
  float autocvar_cl_hitsound_antispam_time;
+ var float autocvar_cl_eventchase_death = 1;
+ var float autocvar_cl_eventchase_intermission = 1;
+ var float autocvar_cl_eventchase_distance = 140;
+ var float autocvar_cl_eventchase_speed = 1.3;
 +float autocvar_cl_damageeffect;
 +float autocvar_cl_damageeffect_gibs;
diff --cc qcsrc/common/constants.qh
index 65a64aa3a,64dcaa44e..97db3ad05
--- a/qcsrc/common/constants.qh
+++ b/qcsrc/common/constants.qh
@@@ -113,7 -113,7 +113,8 @@@ const float ENT_CLIENT_HOOK = 27
  const float ENT_CLIENT_LGBEAM = 28;
  const float ENT_CLIENT_GAUNTLET = 29;
  const float ENT_CLIENT_ACCURACY = 30;
- const float ENT_CLIENT_DAMAGEEFFECT = 31;
+ const float ENT_CLIENT_WARPZONE_TELEPORTED = 31;
++const float ENT_CLIENT_DAMAGEEFFECT = 32;
  
  const float ENT_CLIENT_TURRET = 40;