Merge branch 'master' into divVerent/fruitbalance

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 8e4d45d364413adbf0c88777f28a36b996d5526f..f553047154a8838bdb50199563618407e9f00057 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -345,7 +345,7 @@ set sv_fragmessage_information_typefrag 1 "Enable typefrag display information,
 
 // use default physics
 set sv_friction_on_land 0
-exec physicsNoQWBunny.cfg
+exec physicsNoQWBunny-nexbased.cfg
 
 set sv_player_viewoffset "0 0 35" "view offset of the player model"
 set sv_player_mins "-16 -16 -24" "playermodel mins"

diff --git a/physicsNoQWBunny-nexbased.cfg b/physicsNoQWBunny-nexbased.cfg
index 53f1e534e40a5c0e14654c2a3dcda5112a704373..a440ecbeb326ecd5b2770021a49882a2627655a2 100644 (file)
--- a/physicsNoQWBunny-nexbased.cfg
+++ b/physicsNoQWBunny-nexbased.cfg
@@ -2,23 +2,27 @@
 sv_gravity 800
 sv_maxspeed 400
 sv_maxairspeed 400
+
+
 sv_stopspeed 100
 sv_accelerate 15
 sv_airaccelerate 2
-sv_friction 7
+sv_friction 8
 edgefriction 1
 sv_stepheight 34
-sv_jumpvelocity 300
+
+sv_jumpvelocity 250
 sv_wateraccelerate -1
 sv_waterfriction -1
-sv_airaccel_sideways_friction -0.2
+sv_airaccel_sideways_friction 0
 sv_airaccel_qw -0.9475
-sv_airstopaccelerate 2.5
+
+sv_airstopaccelerate 3
 sv_airstrafeaccelerate 24
 sv_maxairstrafespeed 100
 sv_airstrafeaccel_qw -0.9825
 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-xpmbased.cfg b/physicsNoQWBunny-xpmbased.cfg
new file mode 100644 (file)
index 0000000..3e1cc96
--- /dev/null
+++ b/physicsNoQWBunny-xpmbased.cfg
@@ -0,0 +1,36 @@
+// "NoQWBunny" physics based on XPM
+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.cfg b/physicsNoQWBunny.cfg
deleted file mode 100644 (file)
index 3e1cc96..0000000
--- a/physicsNoQWBunny.cfg
+++ /dev/null
@@ -1,36 +0,0 @@
-// "NoQWBunny" physics based on XPM
-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