candybox - [no description]

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \|	Merge branch 'master' into alexichi	piernov	2016-05-03	14	-18/+217
\| \|\ \
\| \| * \|	Merge branch 'feat/savegame' into piernov	piernov	2016-05-03	8	-31/+130
\| \| \|\\|
\| \| \| *	Merge branch 'feat/savegame' of piernov.org:/srv/git/candybox into feat/savegame	piernov	2016-05-02	2	-3/+3
\| \| \| \|\
\| \| \| \| *	Better when error/info messages aren't swapped	piernov	2016-05-02	2	-3/+3
\| \| \| \| \|
\| \| \| * \|	Allow multiple classes on tabs	piernov	2016-05-02	1	-4/+2
\| \| \| \|/
\| \| \| *	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	4	-0/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Doesn't work because idk which method to use and I don't have the PHP doc right now
\| \| \| *	Add Save tab	piernov	2016-05-02	1	-3/+11
\| \| \| \|
\| \| \| *	Add various JS functions to work with game save	piernov	2016-05-02	1	-0/+32
\| \| \| \|
\| \| \| *	Move saveGame()/downGame() to its own JS file	piernov	2016-05-02	3	-8/+8
\| \| \| \|
\| \| \| *	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	4	-0/+37
\| \| \| \|
\| \| * \|	Force reset mine on game reload	piernov	2016-05-02	1	-1/+2
\| \| \| \|
\| \| * \|	Allow empty data from server	piernov	2016-05-02	1	-1/+2
\| \| \| \|
\| \| * \|	Remove useless mine.mine in	piernov	2016-04-27	1	-1/+1
\| \| \| \|
\| \| * \|	Merge branch 'feat/gui' into piernov	piernov	2016-04-27	1	-0/+6
\| \| \|\ \
\| \| \| * \|	Improve item list appearance	piernov	2016-04-27	1	-0/+6
\| \| \| \| \|
\| \| * \| \|	Merge branch 'feat/savegame' into piernov	piernov	2016-04-27	8	-6/+92
\| \| \|\ \ \ \| \| \| \| \|/ \| \| \| \|/\|
\| \| \| * \|	Add data/save directory	piernov	2016-04-27	1	-0/+1
\| \| \| \| \|
\| \| \| * \|	Add savegame.inc with methods for saving the game	piernov	2016-04-27	1	-0/+44
\| \| \| \| \|
\| \| \| * \|	Savegame PHP action handling	piernov	2016-04-27	1	-0/+3
\| \| \| \| \|
\| \| \| * \|	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
\| \| \| \| \|
\| \| \| * \|	Merge branch 'feat/messages' into feat/savegame	piernov	2016-04-27	1	-2/+10
\| \| \| \|\ \
\| \| \| \| * \|	Add sendInfo() from PHPfeat/messages	piernov	2016-04-27	1	-2/+10
\| \| \| \| \|/
\| \| \| * \|	Add button for saving on server/downloading the game	piernov	2016-04-27	2	-0/+10
\| \| \| \| \|
\| \| \| * \|	Also handle GET request for op in craftmine.php	piernov	2016-04-27	1	-3/+7
\| \| \| \|/
\| \| * /	Automatically show received info	piernov	2016-04-27	1	-0/+2
\| \| \|/
\| \| *	Merge remote-tracking branch 'origin/alexichi' into piernov	piernov	2016-04-25	13	-77/+66
\| \| \|\
\| \| * \|	Add Symbola font for items icons	piernov	2016-04-25	2	-0/+6
\| \| \| \|
\| \| * \|	Merge branch 'feat/shop' into piernov	piernov	2016-04-25	1	-1/+0
\| \| \|\ \
\| \| \| * \|	Account already debitedfeat/shop	piernov	2016-04-25	1	-1/+0
\| \| \| \| \|
\| * \| \| \|	add dungeon client side to display it when reload	alexichi	2016-05-03	3	-1/+10
\| \| \| \| \|
\| * \| \| \|	fix shop item count	alexichi	2016-05-02	2	-8/+9
\| \| \| \| \|
\| * \| \| \|	Add dungeon without fight system	alexichi	2016-05-01	5	-6/+46
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	7	-2/+146
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	3	-10/+27
\| \| \| \| \|
\| * \| \| \|	I lower the prices because it was getting on my nerves	alexichi	2016-04-29	1	-4/+4
\| \| \| \| \|
\| * \| \| \|	add loadShop() and categories in the xml file and modify the presentation of ↵	alexichi	2016-04-27	3	-23/+78
\| \| \|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \|	the items in the shop
* \| \| \|	Merge branch 'alexichi' of ssh://piernov.org/srv/git/candybox into alexichi	piernov	2016-04-25	27	-1721/+457
\|\\| \| \|
\| * \| \|	change class of Hire a Miner, and change type submit to button for items	alexichi	2016-04-25	2	-2/+2
\| \| \| \|
\| * \| \|	Mise en commun du shop et de la guilde	alexichi	2016-04-25	6	-34/+30
\| \| \| \|
\| * \| \|	Merge remote-tracking branch 'origin/piernov' into alexichi	alexichi	2016-04-25	22	-1636/+417
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: craftmine.php index.xhtml
\| \| * \|	Merge branch 'feat/shop' into piernov	piernov	2016-04-24	1	-0/+1
\| \| \|\\|
\| \| \| *	Include PHP inc/craftmine.php	piernov	2016-04-24	1	-0/+1
\| \| \| \|
\| \| * \|	Merge branch 'doc' into piernov	piernov	2016-04-24	8	-1601/+46
\| \| \|\ \
\| \| \| * \|	Update Proposition initiale	piernov	2016-04-24	8	-1601/+46
\| \| \| \| \|
\| \| * \| \|	Merge branch 'feat/shop' into piernov	piernov	2016-04-24	13	-15/+370
\| \| \|\ \ \ \| \| \| \| \|/ \| \| \| \|/\|
\| \| \| * \|	Add css/craftmine.css	piernov	2016-04-24	1	-0/+9
\| \| \| \| \|