]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into LegendaryGuard/legendary_akimbo
authorLegendaryGuard <rootuser999@gmail.com>
Sat, 8 Apr 2023 18:19:28 +0000 (20:19 +0200)
committerLegendaryGuard <rootuser999@gmail.com>
Sat, 8 Apr 2023 18:19:28 +0000 (20:19 +0200)
commit0801ab924d8bcc57149b88f6496eb4be779856b6
tree0ee496c3f5c6bb22192779bc04d5e40b472db387
parente0fcaf1e8099b73d5a3f98891d8eefaecd471225
parentcf8037b6949e9af563c628a76d08e27a3528815a
Merge branch 'master' into LegendaryGuard/legendary_akimbo
13 files changed:
qcsrc/common/mutators/mutator/overkill/oknex.qc
qcsrc/common/weapons/weapon/arc.qc
qcsrc/common/weapons/weapon/devastator.qc
qcsrc/common/weapons/weapon/fireball.qc
qcsrc/common/weapons/weapon/hagar.qc
qcsrc/common/weapons/weapon/hook.qc
qcsrc/common/weapons/weapon/minelayer.qc
qcsrc/common/weapons/weapon/rifle.qc
qcsrc/common/weapons/weapon/vortex.qc
qcsrc/server/damage.qc
qcsrc/server/items/items.qc
qcsrc/server/weapons/tracing.qc
qcsrc/server/weapons/weaponsystem.qc