Merge branch 'master' into bones_was_here/physics

diff --cc physicsCPMA.cfg
index eab16ec6e245ea0c26101ad04280b287ff1b8e41,7653219633599d30c41a59530ddcf616bbbc89d9..61d3ecb5c6765f6185c7d2bb5ae7887131a7a561
--- 1/physicsCPMA.cfg
--- 2/physicsCPMA.cfg
+++ b/physicsCPMA.cfg
@@@ -39,4 -39,4 +39,5 @@@ sv_jumpspeedcap_max "
  sv_jumpspeedcap_max_disable_on_ramps 0
  g_teleport_maxspeed 400
  sv_track_canjump 0
 +sv_gameplayfix_stepdown 0
+ sv_gameplayfix_stepdown_maxspeed 0

diff --cc physicsFruit.cfg
index 68d47281ab7f7d7cc7e329ce26f0ada87709babe,4fcdcce0fcf66e0211058920a72629d317d58e76..ec16f5800b204572b94fdd6eebc077d977d428a9
--- 1/physicsFruit.cfg
--- 2/physicsFruit.cfg
+++ b/physicsFruit.cfg
@@@ -37,4 -37,4 +37,5 @@@ sv_jumpspeedcap_max 0.3
  sv_jumpspeedcap_max_disable_on_ramps 1
  g_teleport_maxspeed 0
  sv_track_canjump 0
 +sv_gameplayfix_stepdown 0
+ sv_gameplayfix_stepdown_maxspeed 0

diff --cc physicsHavoc.cfg
index ab01387b2da65a241a3dc248ad5e853b510f6c6d,a6598de9988b17d71596e22d2af8b1b544ca65c1..8820136261e5f47a799446785d86f86549c5fee5
--- 1/physicsHavoc.cfg
--- 2/physicsHavoc.cfg
+++ b/physicsHavoc.cfg
@@@ -38,4 -38,4 +38,5 @@@ sv_jumpspeedcap_max "
  sv_jumpspeedcap_max_disable_on_ramps 0
  g_teleport_maxspeed 0
  sv_track_canjump 0
 +sv_gameplayfix_stepdown 0
+ sv_gameplayfix_stepdown_maxspeed 0

diff --cc physicsLeeStricklin-ModdedFruit.cfg
index c815fc626a1f7dac6dd0b76ce851c39a211f5653,9bf0e03abfe9408216ae241d462ae19ccd264981..cfe19bc8b4a35390de89a5362b69cb7fd92756e6
--- 1/physicsLeeStricklin-ModdedFruit.cfg
--- 2/physicsLeeStricklin-ModdedFruit.cfg
+++ b/physicsLeeStricklin-ModdedFruit.cfg
@@@ -46,4 -46,4 +46,5 @@@ sv_jumpspeedcap_max "
  sv_jumpspeedcap_max_disable_on_ramps 1
  g_teleport_maxspeed 0
  sv_track_canjump 0
 +sv_gameplayfix_stepdown 0
+ sv_gameplayfix_stepdown_maxspeed 0

diff --cc physicsLeeStricklin.cfg
index 150f573a92091642d591d6d0908ef53af8babffa,c6ecfd9274acaa863dbfcb02606c83ce24383ee6..a6ff10b7c853c619721445d172b74eeb0f7480f4
--- 1/physicsLeeStricklin.cfg
--- 2/physicsLeeStricklin.cfg
+++ b/physicsLeeStricklin.cfg
@@@ -46,4 -46,4 +46,5 @@@ sv_jumpspeedcap_max "
  sv_jumpspeedcap_max_disable_on_ramps 1
  g_teleport_maxspeed 0
  sv_track_canjump 0
 +sv_gameplayfix_stepdown 0
+ sv_gameplayfix_stepdown_maxspeed 0

diff --cc physicsLeeStricklinOld.cfg
index d06094c959018efd27dc17a538a8da8cb6f449b6,8b48b003c5f140a145d438d38069da626848e070..20f6a9f28176288e8b89eab58d23cb0728075d5f
--- 1/physicsLeeStricklinOld.cfg
--- 2/physicsLeeStricklinOld.cfg
+++ b/physicsLeeStricklinOld.cfg
@@@ -41,4 -41,4 +41,5 @@@ sv_jumpspeedcap_max 0.3
  sv_jumpspeedcap_max_disable_on_ramps 0
  g_teleport_maxspeed 0
  sv_track_canjump 0
 +sv_gameplayfix_stepdown 0
+ sv_gameplayfix_stepdown_maxspeed 0

diff --cc physicsLzd.cfg
index 81e5ee8b9c20ee1d9e630ef5f19b377010a98be0,25a3b704e2b8996684209c333f9f1f18b457d466..44c60d679f3e6d1911c656ad220df4ee8eefc43c
--- 1/physicsLzd.cfg
--- 2/physicsLzd.cfg
+++ b/physicsLzd.cfg
@@@ -39,4 -39,4 +39,5 @@@ sv_jumpspeedcap_max "
  sv_jumpspeedcap_max_disable_on_ramps 0
  g_teleport_maxspeed 0
  sv_track_canjump 0
 +sv_gameplayfix_stepdown 0
+ sv_gameplayfix_stepdown_maxspeed 0

diff --cc physicsNexuiz10.cfg
index 6b5730abab84a0daba85d5fbe6d13fe6365f1849,021ba773818d78edc64769d6742c9413e5b73142..0828afd63bc0215086910206d7e6dca177d4c3d1
--- 1/physicsNexuiz10.cfg
--- 2/physicsNexuiz10.cfg
+++ b/physicsNexuiz10.cfg
@@@ -39,4 -39,4 +39,5 @@@ sv_jumpspeedcap_max "
  sv_jumpspeedcap_max_disable_on_ramps 0
  g_teleport_maxspeed 0
  sv_track_canjump 0
 +sv_gameplayfix_stepdown 0
+ sv_gameplayfix_stepdown_maxspeed 0

diff --cc physicsNexuiz11.cfg
index 1a1794df877d3e3f4d7500defb10e619d591a992,7365d1840958052ec5fc7f04aafafc76e6d681dc..ce0c41719451e78ac662e54de20e153679e7adda
--- 1/physicsNexuiz11.cfg
--- 2/physicsNexuiz11.cfg
+++ b/physicsNexuiz11.cfg
@@@ -38,4 -38,4 +38,5 @@@ sv_jumpspeedcap_max "
  sv_jumpspeedcap_max_disable_on_ramps 0
  g_teleport_maxspeed 0
  sv_track_canjump 0
 +sv_gameplayfix_stepdown 0
+ sv_gameplayfix_stepdown_maxspeed 0

diff --cc physicsNexuiz151.cfg
index a4abfaadb206d8d12058b64d673d293dc84c28b9,c8503dbedd7ce9522d9a9ddd59e5723c68c20113..45e3184de8ed616faa0d46fe3756e9f362841daa
--- 1/physicsNexuiz151.cfg
--- 2/physicsNexuiz151.cfg
+++ b/physicsNexuiz151.cfg
@@@ -38,4 -38,4 +38,5 @@@ sv_jumpspeedcap_max "
  sv_jumpspeedcap_max_disable_on_ramps 0
  g_teleport_maxspeed 0
  sv_track_canjump 0
 +sv_gameplayfix_stepdown 0
+ sv_gameplayfix_stepdown_maxspeed 0

diff --cc physicsNexuiz151b.cfg
index 04483c5acfbfe1920c522f26e1fc5143af4c9d3d,656df926bbcf7a6695157b1399e740037fa8ab67..8826953dbc7af4e644b33c9dc8ac663f9ff91f05
--- 1/physicsNexuiz151b.cfg
--- 2/physicsNexuiz151b.cfg
+++ b/physicsNexuiz151b.cfg
@@@ -38,4 -38,4 +38,5 @@@ sv_jumpspeedcap_max "
  sv_jumpspeedcap_max_disable_on_ramps 0
  g_teleport_maxspeed 0
  sv_track_canjump 0
 +sv_gameplayfix_stepdown 0
+ sv_gameplayfix_stepdown_maxspeed 0

diff --cc physicsNexuiz16rc1.cfg
index 5a7b347ae1702e8d4b2987fa316552509b4bf578,9519444327291b3248ae13efe53c4a0e76781773..8b6415e979c00da526185a11c19cfd52b944532c
--- 1/physicsNexuiz16rc1.cfg
--- 2/physicsNexuiz16rc1.cfg
+++ b/physicsNexuiz16rc1.cfg
@@@ -38,4 -38,4 +38,5 @@@ sv_jumpspeedcap_max "
  sv_jumpspeedcap_max_disable_on_ramps 0
  g_teleport_maxspeed 0
  sv_track_canjump 0
 +sv_gameplayfix_stepdown 0
+ sv_gameplayfix_stepdown_maxspeed 0

diff --cc physicsNexuiz20.cfg
index 848b16f67c64b66972a7c3e68577dd1f87f2a36c,a3aff85db63d0e8ddeef0ee45d0acf5fac6f8fce..5d35b945f88ea3c5103c66388504e52a7f640178
--- 1/physicsNexuiz20.cfg
--- 2/physicsNexuiz20.cfg
+++ b/physicsNexuiz20.cfg
@@@ -38,4 -38,4 +38,5 @@@ sv_jumpspeedcap_max "
  sv_jumpspeedcap_max_disable_on_ramps 0
  g_teleport_maxspeed 0
  sv_track_canjump 0
 +sv_gameplayfix_stepdown 0
+ sv_gameplayfix_stepdown_maxspeed 0

diff --cc physicsNexuiz25.cfg
index d23d85a2b2e73bcc0e2bb464341b7d71e1d5727b,51811f9c324500134a304399c376f78e22131b54..87192a4172eeb32a96299509b26f9dd47f16fc69
--- 1/physicsNexuiz25.cfg
--- 2/physicsNexuiz25.cfg
+++ b/physicsNexuiz25.cfg
@@@ -38,4 -38,4 +38,5 @@@ sv_jumpspeedcap_max "
  sv_jumpspeedcap_max_disable_on_ramps 0
  g_teleport_maxspeed 0
  sv_track_canjump 0
 +sv_gameplayfix_stepdown 0
+ sv_gameplayfix_stepdown_maxspeed 0

diff --cc physicsNexuiz26.cfg
index b051952cfa1a863611c22258f14332f577fd3e47,f079f2825a00800fe0e831a94f96fcc65ba50a5e..1c4a0dfb32076aefcfae816bad24aef3694fcd9b
--- 1/physicsNexuiz26.cfg
--- 2/physicsNexuiz26.cfg
+++ b/physicsNexuiz26.cfg
@@@ -38,4 -38,4 +38,5 @@@ sv_jumpspeedcap_max "
  sv_jumpspeedcap_max_disable_on_ramps 0
  g_teleport_maxspeed 0
  sv_track_canjump 0
 +sv_gameplayfix_stepdown 0
+ sv_gameplayfix_stepdown_maxspeed 0

diff --cc physicsNoQWBunny-nexbased.cfg
index c02e1bff558a43c5e06703885b69e9eb4f3212ae,063d2e365fb5145bbbbb39d89e680ca2ece86f52..2816ee9c89c8f9fb40f993da210cf9e3b1021533
--- 1/physicsNoQWBunny-nexbased.cfg
--- 2/physicsNoQWBunny-nexbased.cfg
+++ b/physicsNoQWBunny-nexbased.cfg
@@@ -47,4 -47,4 +47,5 @@@ sv_jumpspeedcap_max "
  sv_jumpspeedcap_max_disable_on_ramps 1
  g_teleport_maxspeed 0
  sv_track_canjump 0
 +sv_gameplayfix_stepdown 0
+ sv_gameplayfix_stepdown_maxspeed 0

diff --cc physicsOverkill.cfg
index b07c1403f6dd97a7fd184654874094125cf8b4f5,b40b5a54f7e93292cb2743c1febc55b110a21c06..2281b80d7a7cc9ac9f6e1fd94a5a2457bcc1367f
--- 1/physicsOverkill.cfg
--- 2/physicsOverkill.cfg
+++ b/physicsOverkill.cfg
@@@ -52,4 -52,4 +52,5 @@@ sv_jumpspeedcap_min "
  sv_jumpspeedcap_max ""
  sv_jumpspeedcap_max_disable_on_ramps 1
  g_teleport_maxspeed 0
 +sv_gameplayfix_stepdown 2
+ sv_gameplayfix_stepdown_maxspeed 400

diff --cc physicsQ.cfg
index 24e87d8bd5295bb84bfa129841756872de3eeabd,d0adac13e71e2c94b7b08e6cc2b2c8ea8f90593d..f99e3f7c9e7436a845d7e471435ff95362ef3dc6
--- 1/physicsQ.cfg
--- 2/physicsQ.cfg
+++ b/physicsQ.cfg
@@@ -39,4 -39,4 +39,5 @@@ sv_jumpspeedcap_max "
  sv_jumpspeedcap_max_disable_on_ramps 0
  g_teleport_maxspeed 0
  sv_track_canjump 0
 +sv_gameplayfix_stepdown 0
+ sv_gameplayfix_stepdown_maxspeed 0

diff --cc physicsQ2.cfg
index 48b4e7ecc9cd0389325a2353e71925671046adcb,7e6e2d6620e5173dc181b524e308002d77fd7c98..926668f5703b3290bc523cf064f9730f2115191b
--- 1/physicsQ2.cfg
--- 2/physicsQ2.cfg
+++ b/physicsQ2.cfg
@@@ -39,4 -39,4 +39,5 @@@ sv_jumpspeedcap_max "
  sv_jumpspeedcap_max_disable_on_ramps 0
  g_teleport_maxspeed 0
  sv_track_canjump 0
 +sv_gameplayfix_stepdown 0
+ sv_gameplayfix_stepdown_maxspeed 0

diff --cc physicsQ2a.cfg
index caf770fdbdcb2454b8f03a53453dc339b817055b,55e31256419cfc2fc70322f4a5555143d92a88c1..2fd96c33be598fb216c53459d3f6bebab65328a2
--- 1/physicsQ2a.cfg
--- 2/physicsQ2a.cfg
+++ b/physicsQ2a.cfg
@@@ -40,4 -40,4 +40,5 @@@ sv_jumpspeedcap_max "
  sv_jumpspeedcap_max_disable_on_ramps 0
  g_teleport_maxspeed 0
  sv_track_canjump 0
 +sv_gameplayfix_stepdown 0
+ sv_gameplayfix_stepdown_maxspeed 0

diff --cc physicsQ3.cfg
index e4f4b78d44dc88340721aba385a82cd2073cc281,be6c7dd8c2b5ed67a0a71c85ab75a68b6248c1ee..972a46e5211edf8632c9fea1473755e9e36d20ba
--- 1/physicsQ3.cfg
--- 2/physicsQ3.cfg
+++ b/physicsQ3.cfg
@@@ -39,4 -39,4 +39,5 @@@ sv_jumpspeedcap_max "
  sv_jumpspeedcap_max_disable_on_ramps 0
  g_teleport_maxspeed 320
  sv_track_canjump 0
 +sv_gameplayfix_stepdown 0
+ sv_gameplayfix_stepdown_maxspeed 0

diff --cc physicsQBF.cfg
index 768c2644986d4bf89730c3796652929222c65827,4d7bdfeb5c88a51fb9d02fb40e9aa1433be73ad5..2ff8d9df3f5c43fdc39e197ad002011cdced820d
--- 1/physicsQBF.cfg
--- 2/physicsQBF.cfg
+++ b/physicsQBF.cfg
@@@ -38,4 -38,4 +38,5 @@@ sv_jumpspeedcap_max "
  sv_jumpspeedcap_max_disable_on_ramps 0
  g_teleport_maxspeed 0
  sv_track_canjump 0
 +sv_gameplayfix_stepdown 0
+ sv_gameplayfix_stepdown_maxspeed 0

diff --cc physicsQBFplus.cfg
index 26935da7fafacd3d1372605480dbd73c9c2e947e,5ae5720c70fc5e81a1d37ef8d88b23de9b0ab7e1..d6aaf5c5867df17b62c749be6ff4e88029d0f67a
--- 1/physicsQBFplus.cfg
--- 2/physicsQBFplus.cfg
+++ b/physicsQBFplus.cfg
@@@ -38,4 -38,4 +38,5 @@@ sv_jumpspeedcap_max "
  sv_jumpspeedcap_max_disable_on_ramps 0
  g_teleport_maxspeed 0
  sv_track_canjump 0
 +sv_gameplayfix_stepdown 0
+ sv_gameplayfix_stepdown_maxspeed 0

diff --cc physicsSamual.cfg
index 618a407d62301c780cc41d5d8db85d29ddc90ec1,8c85486045a59c0991aff5a661f97ce81550aa7f..618208120b51fa7757b24d1c38de642a0d1426e5
--- 1/physicsSamual.cfg
--- 2/physicsSamual.cfg
+++ b/physicsSamual.cfg
@@@ -38,4 -38,4 +38,5 @@@ sv_jumpspeedcap_max "
  sv_jumpspeedcap_max_disable_on_ramps 0
  g_teleport_maxspeed 0
  sv_track_canjump 0
 +sv_gameplayfix_stepdown 0
+ sv_gameplayfix_stepdown_maxspeed 0

diff --cc physicsWarsow.cfg
index 1683c3d250d0be76a64d0519acecc783736a9d58,a89ff6a80f16ae1cb806314306fa04bc7c8a8562..36b9491bf7331b0a7d82304f8dc9eae02f8dd3c7
--- 1/physicsWarsow.cfg
--- 2/physicsWarsow.cfg
+++ b/physicsWarsow.cfg
@@@ -39,4 -39,4 +39,5 @@@ sv_jumpspeedcap_max "
  sv_jumpspeedcap_max_disable_on_ramps 0
  g_teleport_maxspeed 0
  sv_track_canjump 0
 +sv_gameplayfix_stepdown 0
+ sv_gameplayfix_stepdown_maxspeed 0

diff --cc physicsWarsowClassicBunny.cfg
index 37a229ca4debf65c20e49e0c82b2556725689096,71506511527a73947c552dd867c036b97f3171d7..cd39f3b29afeff67bf91cda7c850739bac2adbcc
--- 1/physicsWarsowClassicBunny.cfg
--- 2/physicsWarsowClassicBunny.cfg
+++ b/physicsWarsowClassicBunny.cfg
@@@ -39,4 -39,4 +39,5 @@@ sv_jumpspeedcap_max "
  sv_jumpspeedcap_max_disable_on_ramps 0
  g_teleport_maxspeed 0
  sv_track_canjump 0
 +sv_gameplayfix_stepdown 0
+ sv_gameplayfix_stepdown_maxspeed 0

diff --cc physicsWarsowDev.cfg
index 5110dda0b09184fb77b2dda3a36f79e962919451,bc75e8c6220b820a1d59f084d7247c0c5cbfbdb8..629fe37adf1abc601c7f3c4d04d043a4dbb98564
--- 1/physicsWarsowDev.cfg
--- 2/physicsWarsowDev.cfg
+++ b/physicsWarsowDev.cfg
@@@ -39,4 -39,4 +39,5 @@@ sv_jumpspeedcap_max "
  sv_jumpspeedcap_max_disable_on_ramps 0
  g_teleport_maxspeed 0
  sv_track_canjump 0
 +sv_gameplayfix_stepdown 0
+ sv_gameplayfix_stepdown_maxspeed 0

diff --cc physicsX.cfg
index 3bc0342a9726df6c61e07b813d7dc0d745100385,dfe22345c5e4dc6d3157719b006d8256defe3cbd..9275d7d203d9ceb40f7e3d58136b03ed8a2918a6
--- 1/physicsX.cfg
--- 2/physicsX.cfg
+++ b/physicsX.cfg
@@@ -53,4 -53,4 +53,5 @@@ sv_jumpspeedcap_min "
  sv_jumpspeedcap_max ""
  sv_jumpspeedcap_max_disable_on_ramps 1
  g_teleport_maxspeed 0
 +sv_gameplayfix_stepdown 2
+ sv_gameplayfix_stepdown_maxspeed 400

diff --cc physicsX010.cfg
index 5953ab13e78f6d1a726fc5b5661888cde6d68ed5,72285355326fb32d76efd5638fdd45adbeb3920d..8097e18bc70441ed41f6263f2ac220116843b2fc
--- 1/physicsX010.cfg
--- 2/physicsX010.cfg
+++ b/physicsX010.cfg
@@@ -46,4 -46,4 +46,5 @@@ sv_jumpspeedcap_min "
  sv_jumpspeedcap_max ""
  sv_jumpspeedcap_max_disable_on_ramps 1
  g_teleport_maxspeed 0
 -sv_gameplayfix_stepdown_maxspeed 400
 +sv_gameplayfix_stepdown 0
++sv_gameplayfix_stepdown_maxspeed 0

diff --cc physicsX07.cfg
index 0fddf697b952d0574eb28ae4b46de26f9376fef6,9fcdb9918bc4becd9bac351f9c8915a3ece8434f..ef808b21d68f577ad3989ff7b535b8ae741a7a2d
--- 1/physicsX07.cfg
--- 2/physicsX07.cfg
+++ b/physicsX07.cfg
@@@ -52,4 -52,4 +52,5 @@@ sv_jumpspeedcap_min "
  sv_jumpspeedcap_max ""
  sv_jumpspeedcap_max_disable_on_ramps 1
  g_teleport_maxspeed 0
 -sv_gameplayfix_stepdown_maxspeed 400
 +sv_gameplayfix_stepdown 0
++sv_gameplayfix_stepdown_maxspeed 0

diff --cc physicsXDF.cfg
index 54a59ad79dcad873f1b2eeb8ba5aa9a937ab8393,d7dd0a50e5f2eb5eeaea9481edb2eb86cf25caec..497c5b06b9fb87ee1ed354dca6ab1e9aa58c63dd
--- 1/physicsXDF.cfg
--- 2/physicsXDF.cfg
+++ b/physicsXDF.cfg
@@@ -44,4 -44,4 +44,5 @@@ sv_jumpspeedcap_min 
  sv_jumpspeedcap_max 0.5
  sv_jumpspeedcap_max_disable_on_ramps 1
  g_teleport_maxspeed 600
 +sv_gameplayfix_stepdown 2
+ sv_gameplayfix_stepdown_maxspeed 400

diff --cc physicsXDFLight.cfg
index 37aa0c06e9f4772d8990d6785089b90dd24880dc,3a80e0858eb204c736b4c8ade724a0be121653f9..444ca244086c80aad5e307c9f1f13d5e5f31f161
--- 1/physicsXDFLight.cfg
--- 2/physicsXDFLight.cfg
+++ b/physicsXDFLight.cfg
@@@ -44,4 -44,4 +44,5 @@@ sv_jumpspeedcap_min "
  sv_jumpspeedcap_max ""
  sv_jumpspeedcap_max_disable_on_ramps 1
  g_teleport_maxspeed 0
 +sv_gameplayfix_stepdown 2
+ sv_gameplayfix_stepdown_maxspeed 400

diff --cc xonotic-server.cfg
index 08f6ded2bf969bcc9a27475baf741aa147a70286,be57248acc8b3304fcefd6bbc96c005d779ca50d..5e9eae0eda0bdfc6a524652c988aa6f66e23045b
--- 1/xonotic-server.cfg
--- 2/xonotic-server.cfg
+++ b/xonotic-server.cfg
@@@ -395,6 -397,8 +397,7 @@@ set timelimit_max 60 "maximum match tim
  sv_gameplayfix_delayprojectiles 0
  sv_gameplayfix_q2airaccelerate 1
  sv_gameplayfix_stepmultipletimes 1
 -sv_gameplayfix_stepdown 2
+ sv_gameplayfix_unstickplayers 2
  // only available in qc physics
  set sv_gameplayfix_stepdown_maxspeed 0 "maximum speed walking entities can be moving for stepping down to apply - requires sv_qcphysics 1"