]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit - qcsrc/server/bot/api.qh
Merge branch 'master' into terencehill/glowmod_color_fix
authorMario <mario.mario@y7mail.com>
Sun, 18 Oct 2020 22:22:49 +0000 (08:22 +1000)
committerMario <mario.mario@y7mail.com>
Sun, 18 Oct 2020 22:22:49 +0000 (08:22 +1000)
commitce80a3d3800ee2f5ce8a8d93ccb6b835a46ec5f6
treef5783ff3cc1228f75da8b8f94cde96c9a1c9ae6f
parent9ed0476492d5f4029cc36ac164d452591771ef8a
parentbfce4a2d283acc6df146046e866b8d05a3106266
Merge branch 'master' into terencehill/glowmod_color_fix
qcsrc/client/csqcmodel_hooks.qc
qcsrc/client/weapons/projectile.qc
qcsrc/common/turrets/cl_turrets.qc
qcsrc/common/weapons/all.qh