]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit - qcsrc/common/mapobjects/teleporters.qc
Merge branch 'master' into 'master'
authorterencehill <piuntn@gmail.com>
Sat, 16 Feb 2019 23:08:47 +0000 (23:08 +0000)
committerterencehill <piuntn@gmail.com>
Sat, 16 Feb 2019 23:08:47 +0000 (23:08 +0000)
commit797bf448a96c0c13d783c7c919bb2caf6fa16707
tree010ca6d571ff601c4df1228d26351480f41e5aae
parent057a30619b24b998bb9502aaaf6fd4fc757f9979
parent250b1e189a2098732efa511c488e8c765d7ea066
Merge branch 'master' into 'master'

Fix crash when g_maxplayers smaller than current amount of active players

See merge request xonotic/xonotic-data.pk3dir!637
qcsrc/server/bot/default/bot.qc