]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into drjaska/weapontodo drjaska/weapontodo 1118/head
authordrjaska <drjaska83@gmail.com>
Tue, 7 Feb 2023 14:28:21 +0000 (16:28 +0200)
committerdrjaska <drjaska83@gmail.com>
Tue, 7 Feb 2023 14:35:37 +0000 (16:35 +0200)
commitc0e7f2b2a54fdcfe90c00b40b65024f1b4d46994
treecef3d0a6f05873f06d00e9d9be6d2203e9e4f7e9
parent9713d231d502fbde4636cb70be5d3a8169c6aeae
parentd514a6bf7d35d953cb4e3a56973597ebf81ab4cf
Merge branch 'master' into drjaska/weapontodo
qcsrc/client/hud/panel/ammo.qc
qcsrc/common/mapobjects/trigger/jumppads.qc
qcsrc/common/notifications/all.qh
qcsrc/common/weapons/all.qc
qcsrc/common/weapons/all.qh
qcsrc/common/weapons/weapon.qh
qcsrc/common/weapons/weapon/mortar.qc
qcsrc/server/bot/default/bot.qc
qcsrc/server/chat.qc
qcsrc/server/items/items.qc