]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into z411/bai-server
authorz411 <z411@omaera.org>
Tue, 22 Feb 2022 03:32:48 +0000 (00:32 -0300)
committerz411 <z411@omaera.org>
Tue, 22 Feb 2022 03:32:48 +0000 (00:32 -0300)
commit9d213ded78896cff0b1449f93c77319e6a98c01a
tree104e10d88cc9133091acae899524c67a59312366
parenta1c22d5c0e42b838103624cbc4e54ba366285b9d
parent8bf71db35c06d32aeaf538f022e288f7eeab305e
Merge branch 'master' into z411/bai-server
18 files changed:
gamemodes-server.cfg
qcsrc/client/hud/panel/chat.qc
qcsrc/client/hud/panel/timer.qc
qcsrc/client/main.qc
qcsrc/client/view.qc
qcsrc/common/gamemodes/gamemode/clanarena/sv_clanarena.qc
qcsrc/common/items/inventory.qh
qcsrc/common/mutators/mutator/buffs/sv_buffs.qc
qcsrc/common/notifications/all.qh
qcsrc/common/state.qc
qcsrc/server/client.qc
qcsrc/server/client.qh
qcsrc/server/command/cmd.qc
qcsrc/server/command/vote.qc
qcsrc/server/items/items.qc
qcsrc/server/mutators/events.qh
qcsrc/server/weapons/accuracy.qc
qcsrc/server/weapons/accuracy.qh