From: Mario <mario@smbclan.net>
Date: Sat, 20 Oct 2018 03:48:17 +0000 (+1000)
Subject: Merge branch 'master' into Mario/monsters
X-Git-Tag: xonotic-v0.8.5~7^2~1^2~31
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a3cf497caaf1b3e7e07d9d1e4051bf9ae2e55eca;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Mario/monsters

# Conflicts:
#	qcsrc/common/mapinfo.qh
---

a3cf497caaf1b3e7e07d9d1e4051bf9ae2e55eca
diff --cc qcsrc/common/mapinfo.qh
index fe41609fed,6fbb7ce896..adaa0119b6
--- a/qcsrc/common/mapinfo.qh
+++ b/qcsrc/common/mapinfo.qh
@@@ -472,7 -556,7 +556,7 @@@ REGISTER_GAMETYPE(KEEPAWAY, NEW(Keepawa
  CLASS(Invasion, Gametype)
      INIT(Invasion)
      {
-         this.gametype_init(this, _("Invasion"),"inv","g_invasion",false,"","pointlimit=50 type=0",_("Survive against waves of monsters"));
 -        this.gametype_init(this, _("Invasion"),"inv","g_invasion",false,true,"","pointlimit=50 teams=0 type=0",_("Survive against waves of monsters"));
++        this.gametype_init(this, _("Invasion"),"inv","g_invasion",false,true,"","pointlimit=50 type=0",_("Survive against waves of monsters"));
      }
      METHOD(Invasion, m_parse_mapinfo, bool(string k, string v))
      {