]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Juhu/battle-royale
authorJuhu <5894800-Juhu_@users.noreply.gitlab.com>
Fri, 1 Jul 2022 02:46:01 +0000 (04:46 +0200)
committerJuhu <5894800-Juhu_@users.noreply.gitlab.com>
Fri, 1 Jul 2022 02:46:01 +0000 (04:46 +0200)
commit37c0c0c8ecf6f7df59379072bf29c4f3f8a6092f
tree9abfeb4820042a8f741d7510765eafabff3ba654
parentdc6971be9684c108ceca344e9e7554ccd16e0a0b
parent4557ec2fa262ad06d963f34437cc25db91b85120
Merge branch 'master' into Juhu/battle-royale
30 files changed:
.gitlab-ci.yml
_hud_descriptions.cfg
balance-xdf.cfg
gamemodes-client.cfg
gamemodes-server.cfg
hud_luma.cfg
hud_luminos.cfg
hud_luminos_minimal.cfg
hud_luminos_minimal_xhair.cfg
hud_luminos_old.cfg
hud_nexuiz.cfg
qcsrc/client/csqcmodel_hooks.qc
qcsrc/client/hud/panel/scoreboard.qc
qcsrc/common/deathtypes/all.inc
qcsrc/common/ent_cs.qc
qcsrc/common/gamemodes/gamemode/br/sv_br.qc
qcsrc/common/gamemodes/gamemode/br/sv_dropship.qc
qcsrc/common/gamemodes/gamemode/br/sv_ring.qc
qcsrc/common/mutators/mutator/buffs/sv_buffs.qc
qcsrc/common/notifications/all.inc
qcsrc/common/notifications/all.qh
qcsrc/common/scores.qh
qcsrc/common/stats.qh
qcsrc/common/vehicles/sv_vehicles.qc
qcsrc/menu/xonotic/util.qc
qcsrc/server/chat.qc
qcsrc/server/client.qc
qcsrc/server/damage.qc
qcsrc/server/impulse.qc
qcsrc/server/world.qc