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

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

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

author	z411 <z411@omaera.org>
	Tue, 20 Oct 2020 18:17:45 +0000 (15:17 -0300)
committer	z411 <z411@omaera.org>
	Tue, 20 Oct 2020 18:17:45 +0000 (15:17 -0300)
commit	f4b6d6fd77c0b87a59dbee7cac146fd124c9cbf8
tree	3aaf4b039c8562b5145f289c5d12d6c3b76bc8b1	tree \| snapshot
parent	722ea74921d65929ccbc9fa6a11890de599829c1	commit \| diff
parent	ceea2801b21b131246d9af1919d6034fbd336880	commit \| diff

Merge branch 'master' into z411/bai-server

# Conflicts:
# qcsrc/client/announcer.qc
# qcsrc/client/draw.qh
# qcsrc/client/hud/panel/chat.qc
# qcsrc/client/main.qc
# qcsrc/client/view.qc
# qcsrc/common/items/inventory.qh
# qcsrc/server/client.qc
# qcsrc/server/client.qh
# qcsrc/server/command/cmd.qc
# qcsrc/server/miscfunctions.qc
# qcsrc/server/world.qc

48 files changed:

qcsrc/client/announcer.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/autocvars.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/client/hud/hud.qh	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/infomessages.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/hud/panel/score.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/hud/panel/scoreboard.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/hud/panel/timer.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/hud/panel/weapons.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/main.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/main.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/client/view.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/ent_cs.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/gamemodes/gamemode/clanarena/sv_clanarena.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.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/attackertext/cl_attackertext.qc	diff1 \|	\|	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/net_linked.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/notifications/all.inc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/notifications/all.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/ecs/systems/sv_physics.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/autocvars.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/chat.qc	\|	diff2 \|	blob \| history
qcsrc/server/chat.qh	\|	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/items/items.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/round_handler.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/scores.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/scores.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/teamplay.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/weapons/accuracy.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/weapons/common.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/weapons/tracing.qc	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/autocvars.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/client/hud/hud.qh	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/infomessages.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/hud/panel/score.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/hud/panel/scoreboard.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/hud/panel/timer.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/hud/panel/weapons.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/main.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/main.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/client/view.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/ent_cs.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/gamemodes/gamemode/clanarena/sv_clanarena.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.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/attackertext/cl_attackertext.qc	diff1 \|	\|	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/net_linked.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/notifications/all.inc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/notifications/all.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/ecs/systems/sv_physics.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/autocvars.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/chat.qc	\|	diff2 \|	blob \| history
qcsrc/server/chat.qh	\|	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/items/items.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/round_handler.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/scores.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/scores.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/teamplay.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/weapons/accuracy.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/weapons/common.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/weapons/tracing.qc	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