]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into LegendaryGuard/cyber
authorLegendaryGuard <rootuser999@gmail.com>
Thu, 20 May 2021 21:44:21 +0000 (23:44 +0200)
committerLegendaryGuard <rootuser999@gmail.com>
Thu, 20 May 2021 21:44:21 +0000 (23:44 +0200)
commitdcbf1158016537434e664071f5b41a5abeff9040
treec3af357ef19bfdaa8210dfe8f278b84fea843121
parente2587246a7ca96107d66324008e09c18dd728be5
parent07a78893aa574784739b2aec65632c0f0b0b33eb
Merge branch 'master' into LegendaryGuard/cyber
21 files changed:
balance-mario.cfg
balance-nexuiz25.cfg
balance-overkill.cfg
balance-samual.cfg
balance-xdf.cfg
balance-xonotic.cfg
balance-xpm.cfg
notifications.cfg
qcsrc/client/hud/panel/centerprint.qh
qcsrc/client/hud/panel/scoreboard.qc
qcsrc/common/gamemodes/gamemode/clanarena/sv_clanarena.qc
qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qc
qcsrc/common/mutators/mutator/campcheck/sv_campcheck.qc
qcsrc/common/notifications/all.inc
qcsrc/common/sounds/all.inc
qcsrc/common/util.qc
qcsrc/server/client.qc
qcsrc/server/client.qh
qcsrc/server/command/vote.qc
qcsrc/server/teamplay.qc
qcsrc/server/world.qc