Merge branch 'master' into mirceakitsune/multijump

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

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 2373a9e4e627470f880f3e4a2be25972323390f1..9976b8e3952d8afd533e20eb182667e9180f0232 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -319,7 +319,7 @@ set sv_fragmessage_information_typefrag 1 "Enable typefrag display information,
 
 // use default physics
 set sv_friction_on_land 0
-exec physics26.cfg
+exec physicsNoQWBunny.cfg
 
 set sv_player_viewoffset "0 0 35" "view offset of the player model"
 set sv_player_mins "-16 -16 -24" "playermodel mins"
@@ -825,6 +825,10 @@ set g_bloodloss 0   "amount of health below which blood loss occurs"
 
 set g_footsteps 0      "serverside footstep sounds"
 
+set g_multijump 0      "Number of multiple jumps to allow (jumping again in the air), -1 allows for infinite jumps"
+set g_multijump_delay 0.25     "Delay between multiple jumps"
+set g_multijump_speed 30       "Minimum vertical speed a player must have in order to jump again"
+
 // effects
 r_picmipsprites 0 // Xonotic uses sprites that should never be picmipped (team mate, typing, waypoints)
 r_mipsprites 1
@@ -1794,3 +1798,7 @@ sv_gameplayfix_consistentplayerprethink 1
 
 // support Q1BSP maps
 mod_q1bsp_polygoncollisions 1
+
+// improve some minor details
+sv_gameplayfix_gravityunaffectedbyticrate 1
+sv_gameplayfix_nogravityonground 1