Merge remote-tracking branch 'origin/divVerent/allow-override-item-model'

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

diff --git a/physicsXPM.cfg b/physicsXPM.cfg
index 2a60b65178257fbea2efabc866eb59866fb6d780..f781539485bc37246caaa6d8392d14abb8e360ef 100644 (file)
--- a/physicsXPM.cfg
+++ b/physicsXPM.cfg
@@ -9,19 +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.95
+sv_airaccel_qw_stretchfactor 0
 // CPMA: 1
 sv_airstopaccelerate 2.5
 sv_airstrafeaccelerate 70
 sv_maxairstrafespeed 30
 sv_airstrafeaccel_qw 1
 sv_aircontrol 150
+sv_aircontrol_penalty 0
 sv_aircontrol_power 2
 sv_airspeedlimit_nonqw 0
 sv_warsowbunny_turnaccel 0
@@ -31,5 +33,6 @@ 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
+g_teleport_maxspeed 400