Merge remote-tracking branch 'origin/master' into divVerent/lavafix

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

diff --git a/physicsX.cfg b/physicsX.cfg
index 5cc6b52be804d9f159b7e9bf6ecd888c326c4a84..e2a3ef648087b64716ae7b5a7153a9663995ec67 100644 (file)
--- a/physicsX.cfg
+++ b/physicsX.cfg
@@ -1,4 +1,6 @@
+g_mod_physics Xonotic
 // current Xonotic physics
+
 sv_gravity 800
 sv_maxspeed 360
 sv_maxairspeed 360
@@ -15,6 +17,12 @@ sv_stepheight 26
 
 // actually, what we want is 266.6666 for 180bpm
 // but 260 takes same amount of frames and is nicer to mappers
+// jump height == sv_jumpvelocity^2 / (2*sv_gravity)
+// in this case: 42.25 qu
+// player: 24+45 qu
+// 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 260
 sv_wateraccelerate -1
 sv_waterfriction -1