Merge branch 'master' into terencehill/ft_autorevive_progress

author Mario <mario.mario@y7mail.com>

Fri, 6 Nov 2020 15:00:06 +0000 (01:00 +1000)

committer Mario <mario.mario@y7mail.com>

Fri, 6 Nov 2020 15:00:06 +0000 (01:00 +1000)
author Mario <mario.mario@y7mail.com>
Fri, 6 Nov 2020 15:00:06 +0000 (01:00 +1000)
committer Mario <mario.mario@y7mail.com>
Fri, 6 Nov 2020 15:00:06 +0000 (01:00 +1000)
diff --cc qcsrc/client/view.qc
Simple merge
diff --cc qcsrc/server/damage.qc
Simple merge
diff --cc qcsrc/server/player.qc
Simple merge
author	Mario <mario.mario@y7mail.com>
	Fri, 6 Nov 2020 15:00:06 +0000 (01:00 +1000)
committer	Mario <mario.mario@y7mail.com>
	Fri, 6 Nov 2020 15:00:06 +0000 (01:00 +1000)
		1	2
qcsrc/client/view.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/server/damage.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/server/player.qc	patch \|	diff1 \|	diff2 \|	blob \| history