From: Mario Date: Sat, 18 Apr 2020 15:11:51 +0000 (+1000) Subject: Remove now-closed merge request for proposed Crylink secondary changes X-Git-Tag: xonotic-v0.8.5~1102 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c5127cc40542182854bcade2e943088978574475;p=xonotic%2Fxonotic-data.pk3dir.git Remove now-closed merge request for proposed Crylink secondary changes --- diff --git a/testing.cfg b/testing.cfg index 58df92720..ba05141d9 100644 --- a/testing.cfg +++ b/testing.cfg @@ -2,7 +2,6 @@ // https://gitlab.com/xonotic/xonotic-data.pk3dir/merge_requests/738 alias test_blaster_switch "settemp g_balance_blaster_primary_animtime 0.1 ; settemp g_balance_blaster_switchdelay_drop 0.1 ; g_balance_blaster_switchdelay_raise 0.1" -// https://gitlab.com/xonotic/xonotic-data.pk3dir/merge_requests/614 alias test_crylink_sec_horizontal "settemp g_balance_crylink_secondary_linkexplode 0 ; settemp g_balance_crylink_secondary_other_fadetime 2 ; settemp g_balance_crylink_secondary_other_lifetime 2 ; settemp g_balance_crylink_secondary_speed 4000 ; settemp g_balance_crylink_secondary_spread 0.08 ; settemp g_balance_crylink_secondary_spreadtype 0" alias test_rocket_flying "settemp g_balance_devastator_remote_jump 1"