]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d96d5e5 d914463)
Merge branch 'terencehill/CA_forbidspawn' into 'master'
authorMario <zacjardine@y7mail.com>
Tue, 6 Sep 2016 09:00:38 +0000 (09:00 +0000)
committerMario <zacjardine@y7mail.com>
Tue, 6 Sep 2016 09:00:38 +0000 (09:00 +0000)
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


Trivial merge