From: Martin Taibr Date: Mon, 26 Aug 2019 18:33:06 +0000 (+0200) Subject: Merge branch 'martin-t/seta' into martin-t/master2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=40de0d6f065f2338085e4197dcb20e5c647d4924;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'martin-t/seta' into martin-t/master2 --- 40de0d6f065f2338085e4197dcb20e5c647d4924 diff --cc gamemodes-server.cfg index 2a3bc3278,fc441af95..282ea40f6 --- a/gamemodes-server.cfg +++ b/gamemodes-server.cfg @@@ -365,9 -365,9 +365,9 @@@ set g_freezetag_revive_clearspeed 1.6 " set g_freezetag_revive_extra_size 100 "Distance in qu that you can stand from a frozen teammate to keep reviving him" set g_freezetag_revive_nade 1 "Enable reviving from own nade explosion" set g_freezetag_revive_nade_health 40 "Amount of health player has if they revived from their own nade explosion" -set g_freezetag_round_timelimit 180 "round time limit in seconds" +set g_freezetag_round_timelimit 360 "round time limit in seconds" set g_freezetag_frozen_maxtime 60 "frozen players will be automatically unfrozen after this time in seconds" - seta g_freezetag_teams_override 0 + set g_freezetag_teams_override 0 set g_freezetag_team_spawns 0 "when 1, players spawn from the team spawnpoints of the map, if any" set g_freezetag_teams 0