Merge branch 'master' into fruitiex/fruitbalance

diff --git a/physicsNoQWBunny-XPM.cfg b/physicsNoQWBunny-XPM.cfg
deleted file mode 100644 (file)
index 7da6d02..0000000
--- a/physicsNoQWBunny-XPM.cfg
+++ /dev/null
@@ -1,36 +0,0 @@
-// 2.0-2.4.2 physics minus QW-bunnyhopping-bug, faster onground accel, CPMA air control
-sv_gravity 800
-sv_maxspeed 320
-
-sv_maxairspeed 320
-
-sv_stopspeed 100
-sv_accelerate 15
-sv_airaccelerate 2
-sv_friction 8
-edgefriction 1
-sv_stepheight 34
-
-sv_jumpvelocity 250
-sv_wateraccelerate 4
-sv_waterfriction 1
-sv_airaccel_sideways_friction 0
-sv_airaccel_qw -0.937
-
-sv_airstopaccelerate 3
-sv_airstrafeaccelerate 20
-sv_maxairstrafespeed 96
-sv_airstrafeaccel_qw -0.979
-sv_aircontrol 125
-sv_aircontrol_penalty 100
-sv_aircontrol_power 2.5
-sv_airspeedlimit_nonqw 0
-sv_warsowbunny_turnaccel 0
-sv_warsowbunny_accel 0.1593
-sv_warsowbunny_topspeed 925
-sv_warsowbunny_backtosideratio 0.8
-sv_friction_on_land 0
-sv_doublejump 0
-sv_jumpspeedcap_min ""
-sv_jumpspeedcap_max ""
-sv_jumpspeedcap_max_disable_on_ramps 1

diff --git a/physicsNoQWBunny-nexbased.cfg b/physicsNoQWBunny-nexbased.cfg
new file mode 100644 (file)
index 0000000..53f1e53
--- /dev/null
+++ b/physicsNoQWBunny-nexbased.cfg
@@ -0,0 +1,32 @@
+// "NoQWBunny" physics based on Nexuiz 2.0-2.4.2
+sv_gravity 800
+sv_maxspeed 400
+sv_maxairspeed 400
+sv_stopspeed 100
+sv_accelerate 15
+sv_airaccelerate 2
+sv_friction 7
+edgefriction 1
+sv_stepheight 34
+sv_jumpvelocity 300
+sv_wateraccelerate -1
+sv_waterfriction -1
+sv_airaccel_sideways_friction -0.2
+sv_airaccel_qw -0.9475
+sv_airstopaccelerate 2.5
+sv_airstrafeaccelerate 24
+sv_maxairstrafespeed 100
+sv_airstrafeaccel_qw -0.9825
+sv_aircontrol 125
+sv_aircontrol_penalty 0
+sv_aircontrol_power 2.5
+sv_airspeedlimit_nonqw 0
+sv_warsowbunny_turnaccel 0
+sv_warsowbunny_accel 0.1593
+sv_warsowbunny_topspeed 925
+sv_warsowbunny_backtosideratio 0.8
+sv_friction_on_land 0
+sv_doublejump 0
+sv_jumpspeedcap_min ""
+sv_jumpspeedcap_max ""
+sv_jumpspeedcap_max_disable_on_ramps 1

diff --git a/physicsNoQWBunny.cfg b/physicsNoQWBunny.cfg
index 5a8732b680859d69cbe170bd741fdec529fb97fd..3e1cc9629bc3c4d83ba80a8bc5103beb0a329558 100644 (file)
--- a/physicsNoQWBunny.cfg
+++ b/physicsNoQWBunny.cfg
@@ -1,24 +1,28 @@
-// 2.0-2.4.2 physics minus QW-bunnyhopping-bug, faster onground accel, CPMA air control
+// "NoQWBunny" physics based on XPM
 sv_gravity 800
-sv_maxspeed 400
-sv_maxairspeed 400
+sv_maxspeed 320
+
+sv_maxairspeed 320
+
 sv_stopspeed 100
 sv_accelerate 15
 sv_airaccelerate 2
-sv_friction 7
+sv_friction 8
 edgefriction 1
 sv_stepheight 34
-sv_jumpvelocity 300
-sv_wateraccelerate -1
-sv_waterfriction -1
-sv_airaccel_sideways_friction -0.2
-sv_airaccel_qw -0.9475
-sv_airstopaccelerate 2.5
-sv_airstrafeaccelerate 24
-sv_maxairstrafespeed 100
-sv_airstrafeaccel_qw -0.9825
+
+sv_jumpvelocity 250
+sv_wateraccelerate 4
+sv_waterfriction 1
+sv_airaccel_sideways_friction 0
+sv_airaccel_qw -0.937
+
+sv_airstopaccelerate 3
+sv_airstrafeaccelerate 20
+sv_maxairstrafespeed 96
+sv_airstrafeaccel_qw -0.979
 sv_aircontrol 125
-sv_aircontrol_penalty 0
+sv_aircontrol_penalty 100
 sv_aircontrol_power 2.5
 sv_airspeedlimit_nonqw 0
 sv_warsowbunny_turnaccel 0

diff --git a/physicsNoQWBunny_easy.cfg b/physicsNoQWBunny_easy.cfg
deleted file mode 100644 (file)
index 721f819..0000000
--- a/physicsNoQWBunny_easy.cfg
+++ /dev/null
@@ -1,32 +0,0 @@
-// 2.0-2.4.2 physics minus QW-bunnyhopping-bug, faster onground accel, CPMA air control
-sv_gravity 800
-sv_maxspeed 400
-sv_maxairspeed 400
-sv_stopspeed 100
-sv_accelerate 15
-sv_airaccelerate 2
-sv_friction 7
-edgefriction 1
-sv_stepheight 34
-sv_jumpvelocity 300
-sv_wateraccelerate -1
-sv_waterfriction -1
-sv_airaccel_sideways_friction -0.35
-sv_airaccel_qw -0.9475
-sv_airstopaccelerate 0
-sv_airstrafeaccelerate 0
-sv_maxairstrafespeed 0
-sv_airstrafeaccel_qw 0
-sv_aircontrol 125
-sv_aircontrol_penalty 0
-sv_aircontrol_power 2.5
-sv_airspeedlimit_nonqw 0
-sv_warsowbunny_turnaccel 0
-sv_warsowbunny_accel 0.1593
-sv_warsowbunny_topspeed 925
-sv_warsowbunny_backtosideratio 0.8
-sv_friction_on_land 0
-sv_doublejump 0
-sv_jumpspeedcap_min ""
-sv_jumpspeedcap_max ""
-sv_jumpspeedcap_max_disable_on_ramps 1