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)
FT bugfixes

Closes #2098 and #2079

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

1  2 
qcsrc/server/client.qc
qcsrc/server/defs.qh
qcsrc/server/player.qc

Simple merge
Simple merge
Simple merge