From: Mario <zacjardine@y7mail.com>
Date: Sat, 4 Jul 2015 03:06:12 +0000 (+0000)
Subject: Merge branch 'TimePath/itemsys' into 'master'
X-Git-Tag: xonotic-v0.8.1~53
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8751feffa227c3d12ce6a7c957170726bbf79625;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'TimePath/itemsys' into 'master'

TimePath/itemsys: an item and inventory system

This system and the weapon system seem to overlap quite a bit and would benefit from being combined, currently this one ignores weapons completely.

Current state:
 * All items except weapons are spawned using this system
 * Tracks item pickups from clients and networks their inventories to them
 * Items can define their own behaviour to actions without conditional logic throughout the code

See merge request !128
---

8751feffa227c3d12ce6a7c957170726bbf79625