]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into z411/bai-server
authorz411 <z411@omaera.org>
Tue, 18 Jan 2022 21:00:22 +0000 (18:00 -0300)
committerz411 <z411@omaera.org>
Tue, 18 Jan 2022 21:00:22 +0000 (18:00 -0300)
commite0d80663c69f8d26c96742d7add9e17f7edeec48
treec5ce04dddb8e12fd7354886902a5b4b5b9db7901
parentcb7e4ec9ad4b55a11736057123d317d92ed2e706
parent6d997e7ed11d0f4a3449e8dcab751b06bb305743
Merge branch 'master' into z411/bai-server
12 files changed:
qcsrc/client/hud/panel/weapons.qc
qcsrc/common/_all.inc
qcsrc/common/ent_cs.qc
qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qc
qcsrc/common/notifications/all.qh
qcsrc/common/weapons/weapon/vortex.qh
qcsrc/server/client.qc
qcsrc/server/client.qh
qcsrc/server/damage.qc
qcsrc/server/items/items.qc
qcsrc/server/mutators/events.qh
qcsrc/server/weapons/weaponsystem.qc