Merge branch 'master' into Mario/electro_combo_over_time

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

diff --git a/physicsQ3.cfg b/physicsQ3.cfg
index 3ce18b52a98bef30d6c6f32da3ba0fa0a2a22f5d..08fdde547eda7a7f2f9b193f52f2ef3851992875 100644 (file)
--- a/physicsQ3.cfg
+++ b/physicsQ3.cfg
@@ -1,7 +1,8 @@
 g_mod_physics Q3
 // these values match Quake3
 
-sv_gravity 800
+// See physicsCPMA.cfg for the source of this sv_gravity setting
+sv_gravity 750
 sv_maxspeed 320
 sv_maxairspeed 320
 sv_stopspeed 100
@@ -17,8 +18,10 @@ sv_waterfriction 1
 sv_airaccel_sideways_friction 0
 sv_airaccel_qw 1
 sv_airaccel_qw_stretchfactor 0
-sv_airstopaccelerate 0
-sv_airstrafeaccelerate 0
+// Q3A doesn't have airstopaccelerate and strafeaccelerate
+// but they're added in cpm1_dev_docs.zip with values 1 and 1 in VQ3 mode
+sv_airstopaccelerate 1
+sv_airstrafeaccelerate 1
 sv_maxairstrafespeed 0
 sv_airstrafeaccel_qw 0
 sv_aircontrol 0
@@ -32,9 +35,14 @@ sv_warsowbunny_accel 0.1593
 sv_warsowbunny_topspeed 925
 sv_warsowbunny_backtosideratio 0.8
 sv_friction_on_land 0
+sv_friction_slick 0
 sv_doublejump 0
 sv_jumpspeedcap_min ""
-sv_jumpspeedcap_max ""
+// VQ3 has no ramp jumping
+sv_jumpspeedcap_max 270
 sv_jumpspeedcap_max_disable_on_ramps 0
-g_teleport_maxspeed 320
-sv_track_canjump 0
+// FIXME: Q3 teleporters _set_ speed to 400, not cap it
+g_teleport_maxspeed 400
+sv_track_canjump 1
+sv_gameplayfix_stepdown_maxspeed 0
+g_movement_highspeed_q3_compat 1