]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Lyberta/WaypointIcons
authorMario <mario.mario@y7mail.com>
Sun, 9 Aug 2020 12:49:56 +0000 (22:49 +1000)
committerMario <mario.mario@y7mail.com>
Sun, 9 Aug 2020 12:49:56 +0000 (22:49 +1000)
commitca2b4af3846cb6e38d166006cc3b32c89cf99142
treec6585044f57fd24b2506307d5351dd5aaa5c0134
parentf53ede36a1898c157e840c96ffac2534ab3c8e31
parent52575743c833ba5456bddde8738a468e7236a9b4
Merge branch 'master' into Lyberta/WaypointIcons
18 files changed:
qcsrc/common/items/item.qh
qcsrc/common/items/item/armor.qh
qcsrc/common/items/item/health.qh
qcsrc/common/items/item/jetpack.qh
qcsrc/common/items/item/powerup.qh
qcsrc/common/mutators/mutator/instagib/items.qh
qcsrc/common/mutators/mutator/waypoints/waypointsprites.qc
qcsrc/common/weapons/weapon.qh
qcsrc/common/weapons/weapon/blaster.qh
qcsrc/common/weapons/weapon/crylink.qh
qcsrc/common/weapons/weapon/devastator.qh
qcsrc/common/weapons/weapon/electro.qh
qcsrc/common/weapons/weapon/hagar.qh
qcsrc/common/weapons/weapon/machinegun.qh
qcsrc/common/weapons/weapon/minelayer.qh
qcsrc/common/weapons/weapon/mortar.qh
qcsrc/common/weapons/weapon/shotgun.qh
qcsrc/common/weapons/weapon/vortex.qh