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

diff --combined defaultXonotic.cfg
index b76b602b4c3e42a1dfb24a2ad0c024a24f378801,b7ac696208372384f5830a20bc6e2a7639e30412..8b11b01b96e6a3dfeefa7d7dc0fc913e5cd0db7c
--- 1/defaultXonotic.cfg
--- 2/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@@ -321,14 -321,6 +321,14 @@@ set g_telefrags_teamplay 1 "never telef
  set g_telefrags_avoid 1 "when teleporters have a random destination, avoid teleporting to locations where a telefrag would happen"
  set g_teleport_maxspeed 0 "maximum speed that a player can keep when going through a teleporter (if a misc_teleporter_dest also has a cap the smallest one of these will be used), 0 = don't limit, -1 = keep no speed"
  
 +seta cl_damageeffect 1 "enable weapon damage effects. 1 enables the feature on skeletal models, 2 on any model"
 +seta cl_damageeffect_ticrate 0.1 "particle spawn rate"
 +seta cl_damageeffect_bones 5 "how many damages to allow on a rigged mesh at once (non-skeletal objects are limited to one)"
 +seta cl_damageeffect_distribute 1 "divide particle intensity if multiple damages are present"
 +seta cl_damageeffect_lifetime 0.1 "how much a damage effect lasts, based on damage amount"
 +seta cl_damageeffect_lifetime_min 3 "minimum lifetime a damage effect may have"
 +seta cl_damageeffect_lifetime_max 6 "maximum lifetime a damage effect may have"
 +
  set g_respawn_ghosts 1 "if 1 dead bodies become ghosts and float away when the player respawns"
  set g_respawn_ghosts_speed 5 "the speed with which respawn ghosts float and rotate"
  set g_respawn_ghosts_maxtime 6 "maximum amount of time a respawn ghost can last, minimum time is half this value. 0 disables and ghosts fade when the body would"
@@@ -1784,7 -1776,7 +1784,7 @@@ seta cl_forceplayercolors 0 "make every
  seta cl_forcemyplayermodel "" "set to the model file name you want to show yourself as (requires server to have sv_use_csqc_players 1; does not affect how enemies look with cl_forceplayermodels)"
  seta cl_forcemyplayerskin 0 "set to the skin number you want to show yourself as (requires server to have sv_use_csqc_players 1; does not affect how enemies look with cl_forceplayermodels)"
  seta cl_forcemyplayercolors 0 "set to the color value (encoding is same as _cl_color) for your own player model (requires server to have sv_use_csqc_players 1, and is ignored in teamplay; does not affect how enemies look with cl_forceplayermodels)"
- seta cl_predictionerrorcompensation 0 "try to compensate for prediction errors and reduce preceived lag (requires server to have sv_use_csqc_players 1)"
+ seta cl_movement_errorcompensation 1 "try to compensate for prediction errors and reduce preceived lag (requires server to have sv_use_csqc_players 1)"
  
  // debug cvars for keyhunt attaching
  set _angles "0 0 0"

diff --combined qcsrc/server/vehicles/raptor.qc
index 57221afe2a169ce453d118d8a2010cdf57c0555e,4973859259be48a3619eabdba70de148b87b8366..ab0d388155bf7ca8d17c674d31507770656533e4
--- 1/qcsrc/server/vehicles/raptor.qc
--- 2/qcsrc/server/vehicles/raptor.qc
+++ b/qcsrc/server/vehicles/raptor.qc
@@@ -111,7 -111,7 +111,7 @@@ void raptor_bomb_burst(
      entity bomblet;
      float i;
  
 -    Damage_DamageInfo(self.origin, 0, 0, 0, '0 0 0', DEATH_RAPTOR_BOMB_SPLIT, self);
 +    Damage_DamageInfo(self.origin, 0, 0, 0, '0 0 0', DEATH_RAPTOR_BOMB_SPLIT, 0, self);
  
      for(i = 0; i < autocvar_g_vehicle_raptor_bomblets; ++i)
      {
@@@ -244,10 -244,12 +244,12 @@@ void raptor_exit(float eject
            spot = vehicles_findgoodexit(spot);
            setorigin(self.owner , spot);
            self.owner.velocity = (v_up + v_forward * 0.25) * 750;
+           self.owner.oldvelocity = self.owner.velocity;
        }
        else
        {
-           self.owner.velocity = '0 0 0';
+           self.owner.velocity = normalize(self.velocity) * autocvar_sv_maxairspeed;
+           self.owner.oldvelocity = self.owner.velocity;
            spot = self.origin - v_forward * 200 + '0 0 64';
            spot = vehicles_findgoodexit(spot);
            setorigin(self.owner , spot);