Merge branch 'master' into terencehill/ft_autorevive_progress
authorterencehill <piuntn@gmail.com>
Wed, 7 Oct 2020 13:15:05 +0000 (15:15 +0200)
committerterencehill <piuntn@gmail.com>
Wed, 7 Oct 2020 13:15:05 +0000 (15:15 +0200)
commit6c4bdd5eeea06db69a457997de24bef84b4eaf93
treec63fbc5eb2c2c9a16f705d8d4221efa14ce4a38a
parentf7b69d36a2de4418141df593a41364383a645f28
parentbca355b90c59de6914601c65e48f2f6db975f066
Merge branch 'master' into terencehill/ft_autorevive_progress
gamemodes-server.cfg
qcsrc/client/view.qc
qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qc
qcsrc/server/damage.qc
qcsrc/server/player.qc