Merge commit '2edf2d628ab52514ab531976ee8b06479e56ace7'

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index 5972c06f5bade95ae7988143e2b43c2d3292d3b7..80159b85d7dbb7d05cd2ed4edafb49bd2bcca670 100644 (file)
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -2794,6 +2794,7 @@ void PlayerPreThink (void)
 
                self.prevorigin = self.origin;
 
+               if (!self.vehicle)
                if (((self.BUTTON_CROUCH && !self.hook.state) || self.health <= g_bloodloss) && self.animstate_startframe != self.anim_melee_x) // prevent crouching if using melee attack
                {
                        if (!self.crouch)

diff --git a/qcsrc/server/vehicles/vehicles.qc b/qcsrc/server/vehicles/vehicles.qc
index c2d8b7709269ccc08e5ad418ec439ffe643c7e6b..b0eb99a8682bd6e2db035e6cd3369d4b82b21417 100644 (file)
--- a/qcsrc/server/vehicles/vehicles.qc
+++ b/qcsrc/server/vehicles/vehicles.qc
@@ -958,6 +958,7 @@ void vehicles_damage(entity inflictor, entity attacker, float damage, float deat
             else
                 vehicles_exit(VHEF_RELESE);
 
+        antilag_clear(self);
         self.vehicle_die();
         vehicles_setreturn();
     }

diff --git a/xonotic-credits.txt b/xonotic-credits.txt
index 9129bfc4660cce178bac4c79da14de4c054b98a3..1b0318f21c5a5b515237d088d100575389b530e2 100644 (file)
--- a/xonotic-credits.txt
+++ b/xonotic-credits.txt
@@ -141,7 +141,8 @@ SoulKeeper_p
 Stephan "esteel" Stahl
 The player with the unnecessarily long name
 Wolfgang "Blub\0" Bumiller
-
+Erik "Ablu" Schilling
+BlaXpirit
 **Past Contributors
 Alexander "motorsep" Zubov
 Amos "torus" Dudley