Merge branch 'master' into Mario/gametypes
authorMario <mario.mario@y7mail.com>
Tue, 14 Jul 2020 07:56:35 +0000 (17:56 +1000)
committerMario <mario.mario@y7mail.com>
Tue, 14 Jul 2020 07:56:35 +0000 (17:56 +1000)
commitbe255d5426e17de0dc4beb8c423e780ebd9e617b
treeb6a51bdefdeb675c64e10f70a0d19e1ed4b00aca
parent08d6d22d3dc48e03c7444c6cb0bf0aafa1f8b978
parentd66a166c8ae2b190607950f6176e684fbce9a583
Merge branch 'master' into Mario/gametypes
qcsrc/client/mutators/events.qh
qcsrc/server/g_damage.qc
qcsrc/server/g_world.qc