From: Mario Date: Fri, 27 Sep 2019 15:12:03 +0000 (+0000) Subject: Merge branch 't0uYK8Ne/set_slick_friction' into 'master' X-Git-Tag: xonotic-v0.8.5~1264 X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=4b615d6ea3ee6794ea9368c782393c66ef55c170;hp=bc5f83b65578563d998ba171fc8dcc76a374213f Merge branch 't0uYK8Ne/set_slick_friction' into 'master' Set CPMA, Q2, Q3, and Warsow slick friction to 0 See merge request xonotic/xonotic-data.pk3dir!624 --- diff --git a/physicsCPMA.cfg b/physicsCPMA.cfg index 3c1614dcd3..ca688cd695 100644 --- a/physicsCPMA.cfg +++ b/physicsCPMA.cfg @@ -32,6 +32,7 @@ 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 "" diff --git a/physicsQ2.cfg b/physicsQ2.cfg index f45a81b773..4507cc8c86 100644 --- a/physicsQ2.cfg +++ b/physicsQ2.cfg @@ -32,6 +32,7 @@ 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 1 sv_jumpspeedcap_min "" sv_jumpspeedcap_max "" diff --git a/physicsQ2a.cfg b/physicsQ2a.cfg index 585262a2ed..a515e9be77 100644 --- a/physicsQ2a.cfg +++ b/physicsQ2a.cfg @@ -33,6 +33,7 @@ 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 1 sv_jumpspeedcap_min "" sv_jumpspeedcap_max "" diff --git a/physicsQ3.cfg b/physicsQ3.cfg index 3ce18b52a9..7b650da38e 100644 --- a/physicsQ3.cfg +++ b/physicsQ3.cfg @@ -32,6 +32,7 @@ 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 "" diff --git a/physicsWarsow.cfg b/physicsWarsow.cfg index de7352aab5..c59b8e99e6 100644 --- a/physicsWarsow.cfg +++ b/physicsWarsow.cfg @@ -32,6 +32,7 @@ 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 "" diff --git a/physicsWarsowClassicBunny.cfg b/physicsWarsowClassicBunny.cfg index 7705a4d512..05ece9bea6 100644 --- a/physicsWarsowClassicBunny.cfg +++ b/physicsWarsowClassicBunny.cfg @@ -32,6 +32,7 @@ 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 "" diff --git a/physicsWarsowDev.cfg b/physicsWarsowDev.cfg index 9009beab33..4a272261fe 100644 --- a/physicsWarsowDev.cfg +++ b/physicsWarsowDev.cfg @@ -32,6 +32,7 @@ sv_warsowbunny_accel 0.1585 sv_warsowbunny_topspeed 900 sv_warsowbunny_backtosideratio 0.9 sv_friction_on_land 0 +sv_friction_slick 0 sv_doublejump 0 sv_jumpspeedcap_min "" sv_jumpspeedcap_max ""