Merge remote-tracking branch 'origin/master' into morosophos/server-current4

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

diff --git a/xonotic-server.cfg b/xonotic-server.cfg
index 063425b2615ccb2e2484a722fc1a749bd9b00bee..9fa813ef5ab8804f7f570387d268171bdb49380a 100644 (file)
--- a/xonotic-server.cfg
+++ b/xonotic-server.cfg
@@ -561,6 +561,7 @@ sv_gameplayfix_nogravityonground 1
 sv_legacy_bbox_expand 0
 
 set sv_q3compat_changehitbox 0 "use Q3 player hitbox dimensions and camera height on Q3 maps (maps with an entry in a .arena or .defi file)"
+set sv_q3compat_jumppads 1 "calculate the jump pad trajectory starting at the center of the push trigger instead of the player origin, \"0\" = never, \"1\" = on Q3 maps, \"2\" = on all maps"
 
 set g_movement_highspeed 1 "multiplier scale for movement speed (applies to sv_maxspeed and sv_maxairspeed, also applies to air acceleration when g_movement_highspeed_q3_compat is set to 0)"
 set g_movement_highspeed_q3_compat 0 "apply speed modifiers to air movement in a more Q3-compatible way (only apply speed buffs and g_movement_highspeed to max air speed, not to acceleration)"
@@ -680,5 +681,6 @@ sv_disablenotify 1
 
 set sv_quickmenu_file "" "filename of a custom server's quickmenu that will be selectable from the default client's quickmenu. This file must be sent in a pk3 archive and should have an unique name (e.g. quickmenu-servername.txt) to prevent overriding existing quickmenus"
 
+set sv_checkpoint_house_url "http://127.0.0.1:10876/new-record"
 // Avoid perf problems near '0 0 0'; `set` without a description is because only current DP has this engine cvar
 set sv_areagrid_link_SOLID_NOT 0