Merge branch 'master' into terencehill/ft_autorevive_progress
authorMario <mario.mario@y7mail.com>
Fri, 6 Nov 2020 15:00:06 +0000 (01:00 +1000)
committerMario <mario.mario@y7mail.com>
Fri, 6 Nov 2020 15:00:06 +0000 (01:00 +1000)
1  2 
qcsrc/client/view.qc
qcsrc/server/damage.qc
qcsrc/server/player.qc

Simple merge
Simple merge
Simple merge