Merge branch 'master' into terencehill/bot_waypoints
authorterencehill <piuntn@gmail.com>
Fri, 1 Dec 2017 14:39:56 +0000 (15:39 +0100)
committerterencehill <piuntn@gmail.com>
Fri, 1 Dec 2017 14:39:56 +0000 (15:39 +0100)
commit9e113dae328809b5e7432f434649a35ebb185a52
tree2721464927321864d280aef95da579932ec2b05d
parent6b3f7d6fc917129765479348a8b3957c50af09d9
parentbbed0d928b6e8b3265a4a6322d5d368b83d89701
Merge branch 'master' into terencehill/bot_waypoints
qcsrc/common/triggers/teleporters.qc
qcsrc/common/triggers/trigger/jumppads.qc
qcsrc/server/bot/default/havocbot/roles.qc