]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/infinite_ammo_start Mario/infinite_ammo_start 1314/head
authorMario <mario.mario@y7mail.com>
Tue, 17 Sep 2024 05:03:05 +0000 (15:03 +1000)
committerMario <mario.mario@y7mail.com>
Tue, 17 Sep 2024 05:03:05 +0000 (15:03 +1000)
commitf8936dc8d37ebd13a640c028d4535d417e24565c
tree66a39c1d212d109570e2c53d76027d750bedb0ad
parent37d20c9151063cfcccabe8995a86948ba41b2ca0
parentec1178b2c00d775c5467b76d463afbe69b165f03
Merge branch 'master' into Mario/infinite_ammo_start
qcsrc/common/weapons/weapon/arc.qc
qcsrc/common/weapons/weapon/machinegun.qc
qcsrc/common/weapons/weapon/minelayer.qc
qcsrc/common/weapons/weapon/shotgun.qc
qcsrc/server/bot/default/havocbot/havocbot.qc
qcsrc/server/world.qc