From: FruitieX <rasse@rasse-lappy.localdomain>
Date: Wed, 21 Jul 2010 09:02:18 +0000 (+0300)
Subject: Merge branch 'master' into fruitiex/fruitbalance
X-Git-Tag: xonotic-v0.1.0preview~423^2~26^2~4
X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=cdab827c3bb824ae263c1add2b551d76f524ef77;hp=96c3280cdcffff9511c8c99c62ed522ae0481f4d

Merge branch 'master' into fruitiex/fruitbalance
---

diff --git a/physicsNoQWBunny-XPM.cfg b/physicsNoQWBunny-XPM.cfg
new file mode 100644
index 0000000000..1beaeda7e8
--- /dev/null
+++ b/physicsNoQWBunny-XPM.cfg
@@ -0,0 +1,36 @@
+// 2.0-2.4.2 physics minus QW-bunnyhopping-bug, faster onground accel, CPMA air control
+sv_gravity 800
+sv_maxspeed 320
+
+sv_maxairspeed 320
+
+sv_stopspeed 100
+sv_accelerate 15
+sv_airaccelerate 2
+sv_friction 8
+edgefriction 1
+sv_stepheight 34
+
+sv_jumpvelocity 300
+sv_wateraccelerate 4
+sv_waterfriction 1
+sv_airaccel_sideways_friction 0
+sv_airaccel_qw -0.937
+
+sv_airstopaccelerate 3
+sv_airstrafeaccelerate 24
+sv_maxairstrafespeed 100
+sv_airstrafeaccel_qw -0.979
+sv_aircontrol 125
+sv_aircontrol_penalty 100
+sv_aircontrol_power 2.5
+sv_airspeedlimit_nonqw 0
+sv_warsowbunny_turnaccel 0
+sv_warsowbunny_accel 0.1593
+sv_warsowbunny_topspeed 925
+sv_warsowbunny_backtosideratio 0.8
+sv_friction_on_land 0
+sv_doublejump 0
+sv_jumpspeedcap_min ""
+sv_jumpspeedcap_max ""
+sv_jumpspeedcap_max_disable_on_ramps 1
diff --git a/physicsXPM.cfg b/physicsXPM.cfg
index e523f462f8..74a20a4684 100644
--- a/physicsXPM.cfg
+++ b/physicsXPM.cfg
@@ -32,5 +32,5 @@ sv_warsowbunny_backtosideratio 0.8
 sv_friction_on_land 0
 sv_doublejump 1
 sv_jumpspeedcap_min 0
-sv_jumpspeedcap_max 1
+sv_jumpspeedcap_max 0.5
 sv_jumpspeedcap_max_disable_on_ramps 1
diff --git a/physicsXPMLight.cfg b/physicsXPMLight.cfg
index c429b47a92..db9c6179c0 100644
--- a/physicsXPMLight.cfg
+++ b/physicsXPMLight.cfg
@@ -15,12 +15,12 @@ sv_jumpvelocity 270
 sv_wateraccelerate 4
 sv_waterfriction 1
 sv_airaccel_sideways_friction 0
-sv_airaccel_qw -0.934375
+sv_airaccel_qw -0.9146875
 // CPMA: 1
 sv_airstopaccelerate 6.5625 // matches strafe-stopping speed
 sv_airstrafeaccelerate 14
 sv_maxairstrafespeed 150
-sv_airstrafeaccel_qw -0.99
+sv_airstrafeaccel_qw -0.987
 sv_aircontrol 100
 sv_aircontrol_penalty 100
 sv_aircontrol_power 2.5
diff --git a/qcsrc/server/cl_physics.qc b/qcsrc/server/cl_physics.qc
index 8f3a9aa175..70e702505c 100644
--- a/qcsrc/server/cl_physics.qc
+++ b/qcsrc/server/cl_physics.qc
@@ -1205,8 +1205,13 @@ void SV_PlayerPhysics()
 
 			// CPM
 			if(sv_airstopaccelerate)
-				if(self.velocity * wishdir < 0)
-					airaccel = sv_airstopaccelerate*maxspd_mod;
+			{
+				vector curdir;
+				curdir = self.velocity;
+				curdir_z = 0;
+				curdir = normalize(curdir);
+				airaccel = airaccel + (sv_airstopaccelerate*maxspd_mod - airaccel) * max(0, -(curdir * wishdir));
+			}
 			// note that for straight forward jumping:
 			// step = accel * frametime * wishspeed0;
 			// accel  = bound(0, wishspeed - vel_xy_current, step) * accelqw + step * (1 - accelqw);