]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Juhu/battle-royale Juhu/battle-royale
authorJuhu <5894800-Juhu_@users.noreply.gitlab.com>
Wed, 21 Jun 2023 23:55:28 +0000 (01:55 +0200)
committerJuhu <5894800-Juhu_@users.noreply.gitlab.com>
Wed, 21 Jun 2023 23:55:28 +0000 (01:55 +0200)
commit939d736831489dd57fe5e9744e2fe6b789efc44e
tree4b9c260fe98a69de4186032a80634781c8e2398f
parent76fa5c92a89b7d97088b848f231f8f08e8c169f8
parentc2c16160d15c51e7e355c096998a06cb6537c292
Merge branch 'master' into Juhu/battle-royale
41 files changed:
.gitlab-ci.yml
_hud_descriptions.cfg
balance-mario.cfg
balance-nexuiz25.cfg
balance-overkill.cfg
balance-samual.cfg
balance-xdf.cfg
balance-xonotic.cfg
balance-xpm.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
notifications.cfg
qcsrc/client/csqcmodel_hooks.qc
qcsrc/client/hud/panel/radar.qc
qcsrc/client/hud/panel/scoreboard.qc
qcsrc/common/ent_cs.qc
qcsrc/common/gamemodes/gamemode/_mod.inc
qcsrc/common/gamemodes/gamemode/_mod.qh
qcsrc/common/gamemodes/gamemode/br/sv_br.qc
qcsrc/common/mapinfo.qc
qcsrc/common/mapobjects/triggers.qc
qcsrc/common/mutators/mutator/buffs/sv_buffs.qc
qcsrc/common/mutators/mutator/waypoints/all.inc
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/common/vehicles/vehicle/bumblebee.qc
qcsrc/lib/csqcmodel/cl_player.qc
qcsrc/menu/xonotic/util.qc
qcsrc/server/chat.qc
qcsrc/server/client.qc
qcsrc/server/damage.qc
qcsrc/server/world.qc