summaryrefslogtreecommitdiffstats
path: root/src/Entities/Pickup.cpp (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merged branch 'howaner/Pickups'.Mattes D2014-06-261-6/+27
|\
| * Fixed a comment and changed CombineCount to short.Howaner2014-06-261-2/+2
| * Optimize combining.Howaner2014-06-241-3/+3
| * Better combining.Howaner2014-06-241-3/+20
| * Fix pickup combining over the maximum stack size.Howaner2014-06-241-4/+8
|/
* cEntity::Killed(cEntity *) Handler; Achievement triggers; cPlayer::AwardAchievement()andrew2014-05-121-0/+10
* Entities handle chunks properly againTiger Wang2014-04-121-32/+31
* Add ExpOrb saving.Howaner2014-03-151-1/+1
* Fixed most of the reordering warningsTycho2014-02-051-2/+2
* Implemented pickup combiningTiger Wang2014-01-251-0/+55
* Miscellaneous improvementsTiger Wang2014-01-241-10/+4
* Moved bindings-related to a Bindings subfolder.madmaxoft2013-12-081-1/+1
* Moved source to srcAlexander Harkness2013-11-241-0/+166