From: terencehill <piuntn@gmail.com>
Date: Wed, 5 May 2021 13:14:59 +0000 (+0200)
Subject: Merge branch 'master' into terencehill/freezetag_updates
X-Git-Tag: xonotic-v0.8.5~405^2~32^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=68b050a0b548bba714d11ebef05b414413c9bd04;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into terencehill/freezetag_updates

# Conflicts:
#	gamemodes-server.cfg
---

68b050a0b548bba714d11ebef05b414413c9bd04
diff --cc gamemodes-server.cfg
index bb17922f8,65fb610c8..77a6d735d
--- a/gamemodes-server.cfg
+++ b/gamemodes-server.cfg
@@@ -363,7 -363,7 +363,7 @@@ set g_domination_warmup 5 "time player
  //  freezetag
  // ===========
  set g_freezetag 0 "Freeze Tag: Freeze the opposing team(s) to win, unfreeze teammates by standing next to them"
- set g_freezetag_warmup 10 "Time players get to run around before the round starts"
 -set g_freezetag_warmup 5 "time players get to run around before the round starts"
++set g_freezetag_warmup 10 "time players get to run around before the round starts"
  set g_freezetag_point_limit -1	"Freeze Tag point limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)"
  set g_freezetag_point_leadlimit -1	"Freeze Tag point lead limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)"
  set g_freezetag_revive_speed 0.4 "Speed for reviving a frozen teammate"