Merge branch 'master' into martin-t/globals
authorMartin Taibr <taibr.martin@gmail.com>
Mon, 1 Jul 2019 16:22:58 +0000 (18:22 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Mon, 1 Jul 2019 16:22:58 +0000 (18:22 +0200)
commit991de5e6922cd3c283de56c3249624f0f1bfe767
tree26dfa7b575276a49ae3a0826421b6c025f10a8fe
parentd325a439c88154aa1f827bf274cc1b45fa46e5dc
parenta20e4983a8a50e81c4e91d146767ae52d3415e3c
Merge branch 'master' into martin-t/globals
qcsrc/client/csqcmodel_hooks.qc
qcsrc/client/view.qc
qcsrc/common/debug.qh
qcsrc/common/mutators/mutator/damagetext/cl_damagetext.qc
qcsrc/common/mutators/mutator/spawn_near_teammate/sv_spawn_near_teammate.qc
qcsrc/common/weapons/weapon/shockwave.qc
qcsrc/lib/_all.inc
qcsrc/lib/deglobalization.qh
qcsrc/lib/warpzone/anglestransform.qh
qcsrc/lib/warpzone/server.qc
qcsrc/server/weapons/weaponsystem.qc