]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into z411/bai-server
authorz411 <z411@omaera.org>
Sat, 8 Oct 2022 00:03:03 +0000 (21:03 -0300)
committerz411 <z411@omaera.org>
Sat, 8 Oct 2022 00:03:03 +0000 (21:03 -0300)
commitc8ffc182ec02b4de34827b6d9b58da7c36eb4d36
treeab2ce90c5b05f1d25c5c76c26a0e9a5a520b2abe
parente54d0a3c856ee0218c4d4d97907628c284d4c90c
parentc2a1ed10c5cde711b5ee836f5c52fcb85c0af958
Merge branch 'master' into z411/bai-server
24 files changed:
notifications.cfg
qcsrc/client/announcer.qc
qcsrc/client/hud/panel/infomessages.qc
qcsrc/client/hud/panel/quickmenu.qc
qcsrc/client/hud/panel/scoreboard.qc
qcsrc/client/hud/panel/timer.qc
qcsrc/client/main.qc
qcsrc/client/main.qh
qcsrc/common/mapinfo.qh
qcsrc/common/notifications/all.inc
qcsrc/common/notifications/all.qc
qcsrc/common/stats.qh
qcsrc/common/weapons/weapon/shotgun.qc
qcsrc/server/client.qc
qcsrc/server/client.qh
qcsrc/server/command/cmd.qc
qcsrc/server/command/common.qc
qcsrc/server/command/vote.qc
qcsrc/server/command/vote.qh
qcsrc/server/items/items.qc
qcsrc/server/teamplay.qc
qcsrc/server/world.qc
qcsrc/server/world.qh
xonotic-server.cfg