Merge branch 'master' into Mario/overkill

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

diff --git a/physicsX.cfg b/physicsX.cfg
index c90020fdfabac73874fc3abbe6c98e5e443247d0..2ef0689755b7814c6913b67a73a623fb000cf42b 100644 (file)
--- a/physicsX.cfg
+++ b/physicsX.cfg
@@ -1,7 +1,7 @@
 g_mod_physics Xonotic
 // current Xonotic physics
 
-sv_gravity 720
+sv_gravity 800
 sv_maxspeed 360
 sv_maxairspeed 360
 
@@ -17,14 +17,14 @@ sv_stepheight 31
 // Samual: 31 (just below 32, keeping things smooth without allowing 32qu steps)
 
 // jump duration == 2*sv_jumpvelocity / sv_gravity
-// in this case: 0.6888888888 (thus either 20 or 21 frames)
+// in this case: 0.65 (thus either 19 or 20 frames)
 // jump height == sv_jumpvelocity^2 / (2*sv_gravity)
-// in this case: 42.71
+// in this case: 42.25
 // player: 24+45 qu
-// total: 111.71qu
+// total: 111.25qu
 // this is smaller than 112 qu, so a 112 qu high corridor (7 of 8 grid units in
 // the 16 grid, and the 8th unit used for wall/floor) just lets a player jump!
-sv_jumpvelocity 248
+sv_jumpvelocity 260
 sv_wateraccelerate -1
 sv_waterfriction -1
 sv_airaccel_sideways_friction 0
@@ -38,12 +38,14 @@ sv_airstrafeaccel_qw -0.95
 sv_aircontrol 100
 sv_aircontrol_penalty 0
 sv_aircontrol_power 2
+sv_aircontrol_backwards 0
 sv_airspeedlimit_nonqw 900
 sv_warsowbunny_turnaccel 0
 sv_warsowbunny_accel 0.1593
 sv_warsowbunny_topspeed 925
 sv_warsowbunny_backtosideratio 0.8
 sv_friction_on_land 0
+sv_friction_slick 0.5
 sv_doublejump 0
 sv_jumpspeedcap_min ""
 sv_jumpspeedcap_max ""