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

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

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

author	z411 <z411@omaera.org>
	Thu, 15 Apr 2021 01:58:33 +0000 (21:58 -0400)
committer	z411 <z411@omaera.org>
	Thu, 15 Apr 2021 01:58:33 +0000 (21:58 -0400)
commit	becc801608c0832f5c4725859033dee0ff19332a
tree	4c975bd22d8126555c89d5d04e4bff37a0805331	tree \| snapshot
parent	8b439c57956e65b0c2e1fc4ae14523874ac31d89	commit \| diff
parent	4fdf64c723ae34467c6ec0117ef0e2fdbeabd74b	commit \| diff

Merge branch 'master' into z411/bai-server

50 files changed:

qcsrc/client/announcer.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/hud/panel/centerprint.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/hud/panel/chat.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/hud/panel/scoreboard.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/main.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/shownames.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/command/generic.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/ent_cs.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/ent_cs.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/gamemodes/gamemode/clanarena/sv_clanarena.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/gamemodes/gamemode/cts/sv_cts.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/gamemodes/gamemode/race/sv_race.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/items/inventory.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/monsters/sv_monsters.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/mutators/mutator/buffs/sv_buffs.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/mutators/mutator/instagib/sv_instagib.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/mutators/mutator/overkill/oknex.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/notifications/all.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/replicate.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/scores.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/sounds/all.inc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/stats.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/turrets/all.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/util.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/all.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/electro.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/vaporizer.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/vortex.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/ecs/systems/sv_physics.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/menu/xonotic/credits.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/client.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/client.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/command/cmd.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/command/common.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/command/sv_cmd.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/command/vote.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/damage.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/damage.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/round_handler.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/scores.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/teamplay.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/teamplay.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/weapons/accuracy.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/weapons/accuracy.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/weapons/weaponsystem.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/world.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/world.qh	diff1 \|	diff2 \|	blob \| history

RSS Atom

qcsrc/client/announcer.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/hud/panel/centerprint.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/hud/panel/chat.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/hud/panel/scoreboard.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/main.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/shownames.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/command/generic.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/ent_cs.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/ent_cs.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/gamemodes/gamemode/clanarena/sv_clanarena.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/gamemodes/gamemode/cts/sv_cts.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/gamemodes/gamemode/race/sv_race.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/items/inventory.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/monsters/sv_monsters.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/mutators/mutator/buffs/sv_buffs.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/mutators/mutator/instagib/sv_instagib.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/mutators/mutator/overkill/oknex.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/notifications/all.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/replicate.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/scores.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/sounds/all.inc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/stats.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/turrets/all.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/util.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/all.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/electro.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/vaporizer.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/vortex.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/ecs/systems/sv_physics.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/menu/xonotic/credits.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/client.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/client.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/command/cmd.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/command/common.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/command/sv_cmd.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/command/vote.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/damage.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/damage.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/round_handler.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/scores.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/teamplay.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/teamplay.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/weapons/accuracy.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/weapons/accuracy.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/weapons/weaponsystem.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/world.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/world.qh	diff1 \|	diff2 \|	blob \| history