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

summary | shortlog | log | commit | commitdiff | tree
(merge: 4071a64 087e3fc)

author	z411 <z411@omaera.org>
	Thu, 14 Jan 2021 15:20:59 +0000 (12:20 -0300)
committer	z411 <z411@omaera.org>
	Thu, 14 Jan 2021 15:20:59 +0000 (12:20 -0300)
commit	d8f3458ac5996018c5efb03577b6f98ec58895cf
tree	ff791fec7576c9cad2537f1899d725295849352b	tree \| snapshot
parent	4071a64ac37fc06630806c3356c44582778aae4d	commit \| diff
parent	087e3fcfc529ca2b4b9a3a1707021dfeceb2b39b	commit \| diff

Merge branch 'master' into z411/bai-server

19 files changed:

qcsrc/client/hud/panel/scoreboard.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/main.qc	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/ctf/sv_ctf.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/mutators/mutator/buffs/sv_buffs.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/notifications/all.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/notifications/all.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/replicate.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/teams.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/util.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/electro.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/items/items.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/scores.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/weapons/accuracy.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/weapons/tracing.qc	diff1 \|	diff2 \|	blob \| history