Merge branch 'master' into mirceakitsune/damage_effects

diff --cc defaultXonotic.cfg
Simple merge

diff --cc qcsrc/client/Main.qc
Simple merge

diff --cc qcsrc/client/autocvars.qh
index 8f84144643d30ac2c22583de71cb34bb6aa81d9b,6d157405b04653cadafb3933e162022de10aec41..e4c3170745ae499e30ac0ebb1cb369ab5eec8c7f
--- 1/qcsrc/client/autocvars.qh
--- 2/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 65a64aa3a86d219d800070aa90a33c942fcd389d,64dcaa44e1fb25f1fdb12c3c08767d1286632aad..97db3ad052ec6679847765b01dddca720ab0d15d
--- 1/qcsrc/common/constants.qh
--- 2/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;
  

diff --cc qcsrc/server/autocvars.qh
Simple merge

diff --cc qcsrc/server/cl_client.qc
Simple merge

diff --cc qcsrc/server/cl_player.qc
Simple merge

diff --cc qcsrc/server/defs.qh
Simple merge

diff --cc qcsrc/server/miscfunctions.qc
Simple merge