Merge branch 'master' into terencehill/bot_ai
authorterencehill <piuntn@gmail.com>
Mon, 2 Jul 2018 14:00:01 +0000 (16:00 +0200)
committerterencehill <piuntn@gmail.com>
Mon, 2 Jul 2018 14:00:01 +0000 (16:00 +0200)
commitdde75a49c8c781947c6d5ef5968bb78f24171e25
tree4b72f33580cfca3f6cbb959f36afb37f3486f779
parentb4acf024115193e3f1d12dd0fa05650da3898b92
parent6c3c66fc33bdc66054660c4a038b183681157cd2
Merge branch 'master' into terencehill/bot_ai
qcsrc/common/gamemodes/gamemode/assault/assault.qc
qcsrc/common/gamemodes/gamemode/freezetag/freezetag.qc
qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qc
qcsrc/server/bot/default/bot.qc
qcsrc/server/bot/default/havocbot/havocbot.qc
xonotic-server.cfg