]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
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)
commit111f841193ebc9de39e7f40257b136d93619574b
tree3c0e9f6469ea79071694bff5abdfd7a850794db5
parentd96d5e5d37835ff0703df203274c1e764ec6661a
parentd914463adf967d65345d378e422297683b55db21
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