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

summary | shortlog | log | commit | commitdiff | tree
(merge: 7f24b6a bf7f5c0)

author	terencehill <piuntn@gmail.com>
	Sun, 5 Feb 2023 12:34:05 +0000 (12:34 +0000)
committer	terencehill <piuntn@gmail.com>
	Sun, 5 Feb 2023 12:34:05 +0000 (12:34 +0000)
commit	8397f309599d4074e40e3939d2621e98ff6fd6bb
tree	f16711d4d42d3439b56c3a22c000dd5a3ed9fa60	tree \| snapshot
parent	7f24b6aa32167bdf3e64aa7b6825695b44484fbc	commit \| diff
parent	bf7f5c0b22733002fbde9ac642ef3d9b9274aba0	commit \| diff

Merge branch 'bones_was_here/warmup' into 'master'

Implement g_warmup > 1 and related fixes and refactoring

See merge request xonotic/xonotic-data.pk3dir!1082

qcsrc/server/command/vote.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/world.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/world.qh	diff1 \|	diff2 \|	blob \| history
xonotic-server.cfg	diff1 \|	diff2 \|	blob \| history