From: Mario <zacjardine@y7mail.com>
Date: Fri, 7 Sep 2018 19:12:55 +0000 (+0000)
Subject: Merge branch 'Lyberta/TeamplayOverhaul2' into 'master'
X-Git-Tag: xonotic-v0.8.5~1899
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2f163ba8;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Lyberta/TeamplayOverhaul2' into 'master'

Teamplay overhaul - step 2

Closes #1982 and #2071

See merge request xonotic/xonotic-data.pk3dir!581
---

2f163ba8166694e7467740bb2618e61fa2ef0a9a