Merge remote-tracking branch 'origin/Mario/nexball_updates'
authorRudolf Polzer <divverent@xonotic.org>
Thu, 8 May 2014 16:44:19 +0000 (18:44 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Thu, 8 May 2014 16:44:19 +0000 (18:44 +0200)
commit8f8e406e68601859aa1b6f72f7aa8cc1f401f779
tree134529f47e0e6f11415b36f064ae3558c3bda67f
parent7bd2c6bd315b730528d35b41fb2615dc301df9ad
parent0bf23224a4d38f9a370569ae9083d1b7fa960c5b
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