From: TimePath Date: Tue, 6 Oct 2015 08:04:53 +0000 (+0000) Subject: Merge branch 'TimePath/unified_weapons' into 'master' X-Git-Tag: xonotic-v0.8.2~1874 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=267433aa7d5dd80399b808f692b8bc1ef75f0851;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'TimePath/unified_weapons' into 'master' Unified weapons (L merge request) Internally converts every attack to behave as a weapon, this will be useful for playable monsters later. Nades and hook are now proper offhand weapons. This capability can be used for vehicles and monsters to override the hook button for other abilities. The nexball ball stealer is now its own weapon. Turrets and vehicles also use weapons in preparation for future AI development. See merge request !232 --- 267433aa7d5dd80399b808f692b8bc1ef75f0851