Merge branch 'master' into develop

author terencehill <piuntn@gmail.com>

Tue, 12 Apr 2022 11:56:49 +0000 (13:56 +0200)

committer terencehill <piuntn@gmail.com>

Tue, 12 Apr 2022 11:56:49 +0000 (13:56 +0200)
author terencehill <piuntn@gmail.com>
Tue, 12 Apr 2022 11:56:49 +0000 (13:56 +0200)
committer terencehill <piuntn@gmail.com>
Tue, 12 Apr 2022 11:56:49 +0000 (13:56 +0200)
diff --cc qcsrc/client/csqcmodel_hooks.qc
Simple merge
diff --cc qcsrc/client/main.qc
Simple merge
diff --cc qcsrc/client/view.qc
Simple merge
diff --cc qcsrc/common/weapons/all.qh
Simple merge
diff --cc xonotic-client.cfg
Simple merge
author	terencehill <piuntn@gmail.com>
	Tue, 12 Apr 2022 11:56:49 +0000 (13:56 +0200)
committer	terencehill <piuntn@gmail.com>
	Tue, 12 Apr 2022 11:56:49 +0000 (13:56 +0200)
		1	2
qcsrc/client/csqcmodel_hooks.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/client/main.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/client/view.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/all.qh	patch \|	diff1 \|	diff2 \|	blob \| history
xonotic-client.cfg	patch \|	diff1 \|	diff2 \|	blob \| history