From: Mario <zacjardine@y7mail.com>
Date: Tue, 6 Sep 2016 09:00:38 +0000 (+0000)
Subject: Merge branch 'terencehill/CA_forbidspawn' into 'master'
X-Git-Tag: xonotic-v0.8.2~620
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=111f841193ebc9de39e7f40257b136d93619574b;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'terencehill/CA_forbidspawn' into 'master'

Join fix

* Fix weird issues when join isn't allowed by CA rules or by g_maxplayers
* Handle join by command and join by key press in the same manner making use of a common function

See merge request !364
---

111f841193ebc9de39e7f40257b136d93619574b