]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'TimePath/itemsys' into 'master'
authorMario <zacjardine@y7mail.com>
Sat, 4 Jul 2015 03:06:12 +0000 (03:06 +0000)
committerMario <zacjardine@y7mail.com>
Sat, 4 Jul 2015 03:06:12 +0000 (03:06 +0000)
commit8751feffa227c3d12ce6a7c957170726bbf79625
treed411fd33e8a00ad5a442b16bd71e40b862bb5598
parentcf4d36d9d295ce940e9e9bdf7a711e4036de0b3c
parent2f239100c8b77275d69972f91ac4e7ff913f3d7c
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