]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a3a388a da55ff3)
Merge branch 'terencehill/minplayers_per_team' into 'master'
authorMario <zacjardine@y7mail.com>
Tue, 12 Feb 2019 09:01:14 +0000 (09:01 +0000)
committerMario <zacjardine@y7mail.com>
Tue, 12 Feb 2019 09:01:14 +0000 (09:01 +0000)
Add minplayers_per_team cvar

Closes #2064

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

1  2 
qcsrc/server/bot/default/bot.qc patch | diff1 | diff2 | blob | history
qcsrc/server/g_world.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/server/bot/default/bot.qc
Simple merge
diff --cc qcsrc/server/g_world.qc
Simple merge