candybox - [no description]

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'master' of piernov.org:candybox into alexichialexichi	alexichi	2016-05-11	12	-21/+516
\|\ \| \| \| \| \| \| \| \|	Conflicts: inc/perso.inc
\| *	Add reset current game buttonHEAD master	piernov	2016-05-10	1	-0/+4
\| \|
\| *	Merge branch 'alexichi' into piernov	piernov	2016-05-10	3	-3/+21
\| \|\
\| \| *	Various fixes	piernov	2016-05-10	3	-3/+21
\| \| \|
\| * \|	Merge branch 'phpdoc' into piernov	piernov	2016-05-10	12	-16/+491
\| \|\ \ \| \| \|/ \| \|/\|
\| \| *	Finish Inventory PHPDocphpdoc	piernov	2016-05-09	1	-3/+33
\| \| \|
\| \| *	Add @package and various fixes	piernov	2016-05-08	12	-11/+24
\| \| \|
\| \| *	First PHPDoc push, Inventory not complete	piernov	2016-05-08	12	-19/+449
\| \| \|
* \| \|	add longevity feature to items	alexichi	2016-05-11	1	-7/+14
\| \| \|
* \| \|	correct bonusPower name	alexichi	2016-05-11	1	-3/+4
\|/ /
* \|	continue the use of objects problem	alexichi	2016-05-10	2	-7/+41
\| \|
* \|	add the use of the objects and the feature power and maxHP	alexichi	2016-05-09	5	-8/+48
\|/
*	Fix Item deletion in Inventory again	piernov	2016-05-08	1	-3/+2
\|
*	Items feature support on save/load gamefeat/savegame	piernov	2016-05-08	1	-1/+8
\|
*	Read features from XML + send updated perso stats on useItem()	piernov	2016-05-08	1	-2/+11
\|
*	Fix Item deletion in Inventory + add call to consume()	piernov	2016-05-08	1	-5/+15
\|
*	Add feature attribute to Item class + add consume() method to use those ↵	piernov	2016-05-08	2	-4/+24
\| \| \| \|	features + use coercion on updatePerso() values
*	Add multiple item support to savegame + fix missing includes	piernov	2016-05-08	3	-3/+9
\|
*	Merge branch 'alexichi' into feat/gui	piernov	2016-05-07	6	-7/+66
\|\
\| *	Merge branch 'feat/savegame' into alexichi	piernov	2016-05-07	2	-5/+29
\| \|\
\| * \|	add the use of the life bottle	alexichi	2016-05-07	3	-1/+24
\| \| \|
\| * \|	add the display of the perso characteristics below the title	alexichi	2016-05-07	1	-3/+9
\| \| \|
\| * \|	add xp system and perso server side	alexichi	2016-05-05	4	-3/+25
\| \| \|
\| * \|	add dungeon server side and improve some details like the difference between ↵	alexichi	2016-05-05	2	-6/+13
\| \| \| \| \| \| \| \| \| \| \| \|	floors
* \| \|	Merge branch 'feat/savegame' into piernov	piernov	2016-05-04	2	-5/+29
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	Receive uploaded savegame from PHP	piernov	2016-05-04	2	-0/+23
\| \| \|
\| * \|	Now possible to add format to sendMessage() strings	piernov	2016-05-04	1	-5/+6
\| \| \|
* \| \|	Missing comma	piernov	2016-05-04	1	-1/+1
\| \|/ \|/\|
* \|	Merge branch 'master' into alexichi	piernov	2016-05-03	6	-5/+126
\|\ \
\| * \|	Merge branch 'feat/savegame' into piernov	piernov	2016-05-03	3	-16/+71
\| \|\\|
\| \| *	Better when error/info messages aren't swapped	piernov	2016-05-02	2	-3/+3
\| \| \|
\| \| *	Better when the user isn't allowed of deleting arbitrary files…	piernov	2016-05-02	1	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \|	Thanks PHP for not highligthing the problem and not providing simple solution…
\| \| *	Fix delete save game	piernov	2016-05-02	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Yep, it was called unlink(). Who would've thought of that? Also, let's use the right operator and not fall for Javascript's silliness
\| \| *	Add ability to delete a save	piernov	2016-05-02	2	-0/+9
\| \| \| \| \| \| \| \| \| \| \| \|	Doesn't work because idk which method to use and I don't have the PHP doc right now
\| \| *	Fix game save XML generation + add ability to send a previously generated ↵	piernov	2016-05-02	1	-17/+27
\| \| \| \| \| \| \| \| \| \| \| \|	game save
\| \| *	Implement loading saved games on server	piernov	2016-05-01	3	-0/+35
\| \| \|
\| * \|	Remove useless mine.mine in	piernov	2016-04-27	1	-1/+1
\| \|/
\| *	Add savegame.inc with methods for saving the game	piernov	2016-04-27	1	-0/+44
\| \|
\| *	Add messages for savegame	piernov	2016-04-27	1	-1/+4
\| \|
\| *	Add addToXML() methods on Inventory and Item objects	piernov	2016-04-27	2	-0/+13
\| \|
\| *	Add sendInfo() from PHPfeat/messages	piernov	2016-04-27	1	-2/+10
\| \|
\| *	Merge remote-tracking branch 'origin/alexichi' into piernov	piernov	2016-04-25	6	-22/+36
\| \|\
\| * \|	Account already debitedfeat/shop	piernov	2016-04-25	1	-1/+0
\| \| \|
* \| \|	add dungeon client side to display it when reload	alexichi	2016-05-03	2	-1/+9
\| \| \|
* \| \|	fix shop item count	alexichi	2016-05-02	1	-4/+4
\| \| \|
* \| \|	Add dungeon without fight system	alexichi	2016-05-01	1	-0/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	You can buy a "ticket" to access the dungeon If you exit you have to buy another ticket Problem when we update the page, the default sentence is displayed while it said that you can access the dungeon
* \| \|	add the beginning part of the dungeon	alexichi	2016-05-01	3	-1/+60
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When you have enough money you can buy a ticket and access the dungeon I made a file monsters.xml . It's a bit like the code with the shop but modified When you press the button launch in the onglet dungeon , it display "Battle!" in the console
* \| \|	add the option to not create 2 objects of the same type, doesn't work well	alexichi	2016-04-29	2	-4/+14
\| \| \|
* \| \|	add loadShop() and categories in the xml file and modify the presentation of ↵	alexichi	2016-04-27	1	-15/+21
\| \|/ \|/\| \| \| \| \|	the items in the shop
* \|	Mise en commun du shop et de la guilde	alexichi	2016-04-25	4	-15/+19
\| \|