candybox - [no description]

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge branch 'phpdoc' into piernov	piernov	2016-05-10	1	-1/+69
\|\
\| *	Finish Inventory PHPDocphpdoc	piernov	2016-05-09	1	-3/+33
\| *	Add @package and various fixes	piernov	2016-05-08	1	-0/+2
\| *	First PHPDoc push, Inventory not complete	piernov	2016-05-08	1	-2/+37
* \|	add the use of the objects and the feature power and maxHP	alexichi	2016-05-09	1	-5/+9
\|/
*	Fix Item deletion in Inventory again	piernov	2016-05-08	1	-3/+2
*	Fix Item deletion in Inventory + add call to consume()	piernov	2016-05-08	1	-5/+15
*	Add multiple item support to savegame + fix missing includes	piernov	2016-05-08	1	-1/+1
*	add the use of the life bottle	alexichi	2016-05-07	1	-0/+17
*	Merge branch 'master' into alexichi	piernov	2016-05-03	1	-1/+5
\|\
\| *	Add addToXML() methods on Inventory and Item objects	piernov	2016-04-27	1	-0/+5
* \|	fix shop item count	alexichi	2016-05-02	1	-4/+4
* \|	add the option to not create 2 objects of the same type, doesn't work well	alexichi	2016-04-29	1	-2/+12
\|/
*	Add PHP Inventory class	piernov	2016-04-24	1	-0/+41