git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit

]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit

projects / xonotic / xonotic-data.pk3dir.git / commit

author	Juhu <5894800-Juhu_@users.noreply.gitlab.com>
	Wed, 21 Jun 2023 23:55:28 +0000 (01:55 +0200)
committer	Juhu <5894800-Juhu_@users.noreply.gitlab.com>
	Wed, 21 Jun 2023 23:55:28 +0000 (01:55 +0200)
commit	939d736831489dd57fe5e9744e2fe6b789efc44e
tree	4b9c260fe98a69de4186032a80634781c8e2398f	tree \| snapshot
parent	76fa5c92a89b7d97088b848f231f8f08e8c169f8	commit \| diff
parent	c2c16160d15c51e7e355c096998a06cb6537c292	commit \| diff

Merge branch 'master' into Juhu/battle-royale

41 files changed:

.gitlab-ci.yml	diff1 \|	diff2 \|	blob \| history
_hud_descriptions.cfg	diff1 \|	diff2 \|	blob \| history
balance-mario.cfg	diff1 \|	diff2 \|	blob \| history
balance-nexuiz25.cfg	diff1 \|	diff2 \|	blob \| history
balance-overkill.cfg	diff1 \|	diff2 \|	blob \| history
balance-samual.cfg	diff1 \|	diff2 \|	blob \| history
balance-xdf.cfg	diff1 \|	diff2 \|	blob \| history
balance-xonotic.cfg	diff1 \|	diff2 \|	blob \| history
balance-xpm.cfg	diff1 \|	diff2 \|	blob \| history
gamemodes-client.cfg	diff1 \|	diff2 \|	blob \| history
gamemodes-server.cfg	diff1 \|	diff2 \|	blob \| history
hud_luma.cfg	diff1 \|	diff2 \|	blob \| history
hud_luminos.cfg	diff1 \|	diff2 \|	blob \| history
hud_luminos_minimal.cfg	diff1 \|	diff2 \|	blob \| history
hud_luminos_minimal_xhair.cfg	diff1 \|	diff2 \|	blob \| history
hud_luminos_old.cfg	diff1 \|	diff2 \|	blob \| history
hud_nexuiz.cfg	diff1 \|	diff2 \|	blob \| history
notifications.cfg	diff1 \|	diff2 \|	blob \| history
qcsrc/client/csqcmodel_hooks.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/hud/panel/radar.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/hud/panel/scoreboard.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/ent_cs.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/gamemodes/gamemode/_mod.inc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/gamemodes/gamemode/_mod.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/gamemodes/gamemode/br/sv_br.qc	diff1 \|	\|	blob \| history
qcsrc/common/mapinfo.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/mapobjects/triggers.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/mutators/mutator/buffs/sv_buffs.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/mutators/mutator/waypoints/all.inc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/notifications/all.inc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/notifications/all.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/scores.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/stats.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/vehicles/sv_vehicles.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/vehicles/vehicle/bumblebee.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/lib/csqcmodel/cl_player.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/menu/xonotic/util.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/chat.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/client.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/damage.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/world.qc	diff1 \|	diff2 \|	blob \| history

RSS Atom

.gitlab-ci.yml	diff1 \|	diff2 \|	blob \| history
_hud_descriptions.cfg	diff1 \|	diff2 \|	blob \| history
balance-mario.cfg	diff1 \|	diff2 \|	blob \| history
balance-nexuiz25.cfg	diff1 \|	diff2 \|	blob \| history
balance-overkill.cfg	diff1 \|	diff2 \|	blob \| history
balance-samual.cfg	diff1 \|	diff2 \|	blob \| history
balance-xdf.cfg	diff1 \|	diff2 \|	blob \| history
balance-xonotic.cfg	diff1 \|	diff2 \|	blob \| history
balance-xpm.cfg	diff1 \|	diff2 \|	blob \| history
gamemodes-client.cfg	diff1 \|	diff2 \|	blob \| history
gamemodes-server.cfg	diff1 \|	diff2 \|	blob \| history
hud_luma.cfg	diff1 \|	diff2 \|	blob \| history
hud_luminos.cfg	diff1 \|	diff2 \|	blob \| history
hud_luminos_minimal.cfg	diff1 \|	diff2 \|	blob \| history
hud_luminos_minimal_xhair.cfg	diff1 \|	diff2 \|	blob \| history
hud_luminos_old.cfg	diff1 \|	diff2 \|	blob \| history
hud_nexuiz.cfg	diff1 \|	diff2 \|	blob \| history
notifications.cfg	diff1 \|	diff2 \|	blob \| history
qcsrc/client/csqcmodel_hooks.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/hud/panel/radar.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/hud/panel/scoreboard.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/ent_cs.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/gamemodes/gamemode/_mod.inc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/gamemodes/gamemode/_mod.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/gamemodes/gamemode/br/sv_br.qc	diff1 \|	\|	blob \| history
qcsrc/common/mapinfo.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/mapobjects/triggers.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/mutators/mutator/buffs/sv_buffs.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/mutators/mutator/waypoints/all.inc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/notifications/all.inc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/notifications/all.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/scores.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/stats.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/vehicles/sv_vehicles.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/vehicles/vehicle/bumblebee.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/lib/csqcmodel/cl_player.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/menu/xonotic/util.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/chat.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/client.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/damage.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/world.qc	diff1 \|	diff2 \|	blob \| history