Merge branch 'master' into terencehill/music_player

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

diff --git a/physicsX.cfg b/physicsX.cfg
index 54955371bfba11cc8e98fdb77a26e14fdb4c3d46..e03a6d4171b442f1f5297e3c2f9db5b676cd7c99 100644 (file)
--- a/physicsX.cfg
+++ b/physicsX.cfg
@@ -1,7 +1,7 @@
 g_mod_physics Xonotic
 // current Xonotic physics
 
-sv_gravity 700
+sv_gravity 800
 sv_maxspeed 360
 sv_maxairspeed 360
 
@@ -16,13 +16,15 @@ sv_stepheight 31
 // Xon 0.7: 24+2
 // 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)
 // jump height == sv_jumpvelocity^2 / (2*sv_gravity)
-// in this case: 42.87 qu
+// in this case: 42.25
 // player: 24+45 qu
-// total: 111.87qu
+// 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 245
+sv_jumpvelocity 260
 sv_wateraccelerate -1
 sv_waterfriction -1
 sv_airaccel_sideways_friction 0