Merge branch 'terencehill/ft_bugfix' into 'master'
authorMario <zacjardine@y7mail.com>
Thu, 27 Sep 2018 01:26:44 +0000 (01:26 +0000)
committerMario <zacjardine@y7mail.com>
Thu, 27 Sep 2018 01:26:44 +0000 (01:26 +0000)
commit1ff1288152dd20786853bed28c9d9aad1f21c8a5
tree1259ab9c03c46e04b26116f6bf0aa0b293920958
parent1c2b52415970d75d0a7ddd03fea6c95557c6f64c
parentf68a8db16a710807bac1d00ec1896bf6e6e0712c
Merge branch 'terencehill/ft_bugfix' into 'master'

FT bugfixes

Closes #2098 and #2079

See merge request xonotic/xonotic-data.pk3dir!600
qcsrc/server/client.qc
qcsrc/server/defs.qh
qcsrc/server/player.qc