From: Rudolf Polzer <divverent@xonotic.org>
Date: Thu, 8 May 2014 16:44:19 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/Mario/nexball_updates'
X-Git-Tag: xonotic-v0.8.0~221
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8f8e406e68601859aa1b6f72f7aa8cc1f401f779;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote-tracking branch 'origin/Mario/nexball_updates'

* origin/Mario/nexball_updates:
  Add an option to always show 3rd person view in nexball while not carrying weapons, show a waypoint at the enemy's goal so players know where to take the ball, fix nexball showing up as a modification rather than a gamemode
---

8f8e406e68601859aa1b6f72f7aa8cc1f401f779