From: Nikolay S. <nick@teichisma.info>
Date: Thu, 21 Mar 2024 17:47:31 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into morosophos/server-current4
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=daca069cca73a8d436258e284cb1aade919cb799;p=xonotic%2Fxonotic-data.pk3dir.git

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

daca069cca73a8d436258e284cb1aade919cb799
diff --cc xonotic-server.cfg
index 4bdf630e57,063425b261..9fa813ef5a
--- a/xonotic-server.cfg
+++ b/xonotic-server.cfg
@@@ -555,8 -557,10 +557,11 @@@ sv_gameplayfix_unstickplayers 
  sv_gameplayfix_gravityunaffectedbyticrate 1
  sv_gameplayfix_nogravityonground 1
  
+ // avoid needing to work around Quake bbox expansion in many places
+ 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)"