Merge branch 'master' into terencehill/misc_bugfixes

[xonotic/xonotic-data.pk3dir.git] / physicsNoQWBunny-nexbased.cfg

diff --git a/physicsNoQWBunny-nexbased.cfg b/physicsNoQWBunny-nexbased.cfg
index 4a66ddf90930ac823891064f7dd428bbd352bf66..ebeeb39ab65fed00bc14ad886429e54d473fed35 100644 (file)
--- a/physicsNoQWBunny-nexbased.cfg
+++ b/physicsNoQWBunny-nexbased.cfg
@@ -1,6 +1,6 @@
 // "NoQWBunny" physics based on Nexuiz 2.0-2.4.2
 sv_gravity 800
-sv_maxspeed 400
+sv_maxspeed 360
 sv_maxairspeed 400
 
 
@@ -11,10 +11,9 @@ sv_friction 8
 edgefriction 1
 sv_stepheight 34
 
-//sv_jumpvelocity 250
-// temp workaround for engine bug (we want 192bpm music to fit)
-sv_jumpvelocity 245
-// 240 would correspond to 200bpm music, could be nice too, but also fails in DP
+// actually, what we want is 266.6666 for 180bpm
+// but 260 takes same amount of frames and is nicer to mappers
+sv_jumpvelocity 260
 sv_wateraccelerate -1
 sv_waterfriction -1
 sv_airaccel_sideways_friction 0
@@ -26,7 +25,7 @@ sv_maxairstrafespeed 100
 sv_airstrafeaccel_qw -0.9825
 sv_aircontrol 125
 sv_aircontrol_penalty 100
-sv_aircontrol_power 2.5
+sv_aircontrol_power 2
 sv_airspeedlimit_nonqw 0
 sv_warsowbunny_turnaccel 0
 sv_warsowbunny_accel 0.1593