Merge branch 'samual/water_and_damage_blur' into samual/hud_contents

[xonotic/xonotic-data.pk3dir.git] / physicsXPMLight.cfg

diff --git a/physicsXPMLight.cfg b/physicsXPMLight.cfg
index db8e6eff00edda2c09dad52989e11b363d7bbd43..3e7ee55570fa21cc92fa488a4aaae9b3a99336a4 100644 (file)
--- a/physicsXPMLight.cfg
+++ b/physicsXPMLight.cfg
@@ -9,20 +9,21 @@ sv_accelerate 15
 sv_airaccelerate 1
 sv_friction 8
 edgefriction 1
-sv_stepheight 34
+sv_stepheight 26
 // CPMA: 18
 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_aircontrol 150
-sv_aircontrol_power 2
+sv_airstrafeaccel_qw -0.987
+sv_aircontrol 100
+sv_aircontrol_penalty 100
+sv_aircontrol_power 2.5
 sv_airspeedlimit_nonqw 0
 sv_warsowbunny_turnaccel 0
 sv_warsowbunny_accel 0.1593
@@ -33,3 +34,4 @@ sv_doublejump 0
 sv_jumpspeedcap_min ""
 sv_jumpspeedcap_max ""
 sv_jumpspeedcap_max_disable_on_ramps 1
+g_teleport_maxspeed 0