git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit

]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit

author	terencehill <piuntn@gmail.com>
	Sat, 2 Dec 2017 21:36:00 +0000 (22:36 +0100)
committer	terencehill <piuntn@gmail.com>
	Sat, 2 Dec 2017 21:36:00 +0000 (22:36 +0100)
commit	f84d4c215d826d9b035e1ba79a22af077f123f55
tree	ed3ad85a2a4a3c51b6bd719fa4e5583562b782ed	tree \| snapshot
parent	3b4c3d10c70529e970952f183a7ee8fa3a00c2f7	commit \| diff
parent	042089583dd3eae6bbe1cbdf85bd694d5bd1bb0c	commit \| diff

Merge remote-tracking branch 'origin/terencehill/bot_waypoints' into terencehill/bot_ai

# Conflicts:
# qcsrc/server/bot/default/navigation.qh

defaultServer.cfg	diff1 \|	diff2 \|	blob \| history
qcsrc/common/triggers/trigger/jumppads.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/autocvars.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/bot/default/havocbot/roles.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/bot/default/navigation.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator/gamemode_cts.qc	diff1 \|	diff2 \|	blob \| history