]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into LegendaryGuard/cyber
authorLegendaryGuard <rootuser999@gmail.com>
Sat, 12 Jun 2021 15:04:10 +0000 (17:04 +0200)
committerLegendaryGuard <rootuser999@gmail.com>
Sat, 12 Jun 2021 15:04:10 +0000 (17:04 +0200)
commitb426d496c413fe4779195e7f3075e52378bb6125
tree43928ab0ee48a820f2487eb69e30c6170999cabb
parent64e0e8333aac9f69f742b49dfad877ec4aebfcd0
parent7acf3137d976ba674cb425378051a19396f71a77
Merge branch 'master' into LegendaryGuard/cyber
15 files changed:
gamemodes-server.cfg
qcsrc/client/hud/hud.qh
qcsrc/client/hud/panel/scoreboard.qc
qcsrc/client/view.qc
qcsrc/common/gamemodes/gamemode/clanarena/sv_clanarena.qc
qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qc
qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qh
qcsrc/common/gamemodes/gamemode/race/sv_race.qc
qcsrc/common/mutators/mutator/buffs/sv_buffs.qc
qcsrc/common/notifications/all.inc
qcsrc/server/client.qc
qcsrc/server/damage.qc
qcsrc/server/items/items.qc
qcsrc/server/mutators/events.qh
qcsrc/server/world.qc