de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit - qcsrc/server/bot/api.qh

]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit - qcsrc/server/bot/api.qh

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

summary | shortlog | log | commit | commitdiff | tree
(merge: 7299b6f 1558591)

author	terencehill <piuntn@gmail.com>
	Sun, 16 Oct 2022 21:07:33 +0000 (23:07 +0200)
committer	terencehill <piuntn@gmail.com>
	Sun, 16 Oct 2022 21:07:33 +0000 (23:07 +0200)
commit	d2a588188f8e5c3cdcc716ddc08d521ee26b483f
tree	09214542bc19bbba31a9a06606cfbc1095e8fbb7	tree \| snapshot
parent	7299b6f0c3aff0078d5279870bf14670ee320dcf	commit \| diff
parent	15585913a7e3eb6bd1ec6fce51c8dca0f61ce672	commit \| diff

Merge branch 'master' into terencehill/player_sorting

# Conflicts:
# .gitlab-ci.yml

qcsrc/client/hud/panel/scoreboard.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/scores.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/scores_rules.qc	diff1 \|	diff2 \|	blob \| history