]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into z411/bai-server
authorz411 <z411@omaera.org>
Thu, 30 Jun 2022 23:30:38 +0000 (19:30 -0400)
committerz411 <z411@omaera.org>
Thu, 30 Jun 2022 23:30:38 +0000 (19:30 -0400)
commit77d27c7418af029163646cbf02b2ce31c7d213f7
tree06fa5c41c7558a0fac70aa349ca9853b07d6d09a
parentfe7dca427b30efc1ebd38c0d398d1f212540d1bc
parent4557ec2fa262ad06d963f34437cc25db91b85120
Merge branch 'master' into z411/bai-server
30 files changed:
gamemodes-client.cfg
gamemodes-server.cfg
notifications.cfg
qcsrc/client/announcer.qc
qcsrc/client/hud/panel/centerprint.qc
qcsrc/client/hud/panel/score.qc
qcsrc/client/hud/panel/scoreboard.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/gamemodes/gamemode/race/sv_race.qc
qcsrc/common/monsters/sv_monsters.qc
qcsrc/common/notifications/all.inc
qcsrc/common/notifications/all.qh
qcsrc/common/util.qc
qcsrc/common/weapons/weapon/electro.qc
qcsrc/menu/xonotic/util.qc
qcsrc/server/client.qc
qcsrc/server/command/cmd.qc
qcsrc/server/command/common.qc
qcsrc/server/command/vote.qc
qcsrc/server/damage.qc
qcsrc/server/items/items.qc
qcsrc/server/mutators/events.qh
qcsrc/server/scores.qc
qcsrc/server/scores.qh
qcsrc/server/teamplay.qc
qcsrc/server/world.qc
qcsrc/server/world.qh