From: Mario Date: Tue, 24 Sep 2019 10:44:56 +0000 (+0000) Subject: Merge branch 'martin-t/defaults' into 'master' X-Git-Tag: xonotic-v0.8.5~1279 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9ce1079a850c81a5f14a150f6a19cad2f51f6032;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'martin-t/defaults' into 'master' Defaults for gamemodes See merge request xonotic/xonotic-data.pk3dir!662 --- 9ce1079a850c81a5f14a150f6a19cad2f51f6032 diff --cc gamemodes-server.cfg index 548a51223,223e91262..7db5b3f0a --- a/gamemodes-server.cfg +++ b/gamemodes-server.cfg @@@ -366,12 -365,11 +366,12 @@@ 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 +set g_freezetag_weaponarena "most_available" "starting weapons - takes the same options as g_weaponarena" // ==========