From: Mario Date: Sun, 2 Aug 2015 12:23:59 +0000 (+0000) Subject: Merge branch 'Mario/ctf_updates' into 'master' X-Git-Tag: xonotic-v0.8.1~29 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9bfe9848d9c54a44c266ddd61d7cda1f2441f616;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'Mario/ctf_updates' into 'master' Merge branch Mario/ctf_updates (L merge request) Adds support for 3 and 4 team CTF, along with a couple of other fixes & features (namely one-flag, new reverse mode where flags are not switched & players pickup their own flag, option to delay returning of the flag when it touches the void). See merge request !142 --- 9bfe9848d9c54a44c266ddd61d7cda1f2441f616