aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* add dungeon server side and improve some details like the difference between ↵alexichi2016-05-057-25/+90
| | | | floors
* Merge branch 'master' into alexichipiernov2016-05-0314-18/+217
|\
| * Merge branch 'feat/savegame' into piernovpiernov2016-05-038-31/+130
| |\
| | * Merge branch 'feat/savegame' of piernov.org:/srv/git/candybox into feat/savegamepiernov2016-05-022-3/+3
| | |\
| | | * Better when error/info messages aren't swappedpiernov2016-05-022-3/+3
| | | |
| | * | Allow multiple classes on tabspiernov2016-05-021-4/+2
| | |/
| | * Better when the user isn't allowed of deleting arbitrary files…piernov2016-05-021-2/+3
| | | | | | | | | | | | Thanks PHP for not highligthing the problem and not providing simple solution…
| | * Fix delete save gamepiernov2016-05-021-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 savepiernov2016-05-024-0/+13
| | | | | | | | | | | | Doesn't work because idk which method to use and I don't have the PHP doc right now
| | * Add Save tabpiernov2016-05-021-3/+11
| | |
| | * Add various JS functions to work with game savepiernov2016-05-021-0/+32
| | |
| | * Move saveGame()/downGame() to its own JS filepiernov2016-05-023-8/+8
| | |
| | * Fix game save XML generation + add ability to send a previously generated ↵piernov2016-05-021-17/+27
| | | | | | | | | | | | game save
| | * Implement loading saved games on serverpiernov2016-05-014-0/+37
| | |
| * | Force reset mine on game reloadpiernov2016-05-021-1/+2
| | |
| * | Allow empty data from serverpiernov2016-05-021-1/+2
| | |
| * | Remove useless mine.mine inpiernov2016-04-271-1/+1
| | |
| * | Merge branch 'feat/gui' into piernovpiernov2016-04-271-0/+6
| |\ \
| | * | Improve item list appearancepiernov2016-04-271-0/+6
| | | |
| * | | Merge branch 'feat/savegame' into piernovpiernov2016-04-278-6/+92
| |\ \ \ | | | |/ | | |/|
| | * | Add data/save directorypiernov2016-04-271-0/+1
| | | |
| | * | Add savegame.inc with methods for saving the gamepiernov2016-04-271-0/+44
| | | |
| | * | Savegame PHP action handlingpiernov2016-04-271-0/+3
| | | |
| | * | Add messages for savegamepiernov2016-04-271-1/+4
| | | |
| | * | Add addToXML() methods on Inventory and Item objectspiernov2016-04-272-0/+13
| | | |
| | * | Merge branch 'feat/messages' into feat/savegamepiernov2016-04-271-2/+10
| | |\ \
| | | * | Add sendInfo() from PHPfeat/messagespiernov2016-04-271-2/+10
| | | |/
| | * | Add button for saving on server/downloading the gamepiernov2016-04-272-0/+10
| | | |
| | * | Also handle GET request for op in craftmine.phppiernov2016-04-271-3/+7
| | |/
| * / Automatically show received infopiernov2016-04-271-0/+2
| |/
| * Merge remote-tracking branch 'origin/alexichi' into piernovpiernov2016-04-2513-77/+66
| |\
| * | Add Symbola font for items iconspiernov2016-04-252-0/+6
| | |
| * | Merge branch 'feat/shop' into piernovpiernov2016-04-251-1/+0
| |\ \
| | * | Account already debitedfeat/shoppiernov2016-04-251-1/+0
| | | |
* | | | add dungeon client side to display it when reloadalexichi2016-05-033-1/+10
| | | |
* | | | fix shop item countalexichi2016-05-022-8/+9
| | | |
* | | | Add dungeon without fight systemalexichi2016-05-015-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 dungeonalexichi2016-05-017-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 wellalexichi2016-04-293-10/+27
| | | |
* | | | I lower the prices because it was getting on my nervesalexichi2016-04-291-4/+4
| | | |
* | | | add loadShop() and categories in the xml file and modify the presentation of ↵alexichi2016-04-273-23/+78
| |_|/ |/| | | | | | | | the items in the shop
* | | change class of Hire a Miner, and change type submit to button for itemsalexichi2016-04-252-2/+2
| | |
* | | Mise en commun du shop et de la guildealexichi2016-04-256-34/+30
| | |
* | | Merge remote-tracking branch 'origin/piernov' into alexichialexichi2016-04-2522-1636/+417
|\| | | | | | | | | | | | | | | | | Conflicts: craftmine.php index.xhtml
| * | Merge branch 'feat/shop' into piernovpiernov2016-04-241-0/+1
| |\|
| | * Include PHP inc/craftmine.phppiernov2016-04-241-0/+1
| | |
| * | Merge branch 'doc' into piernovpiernov2016-04-248-1601/+46
| |\ \
| | * | Update Proposition initialepiernov2016-04-248-1601/+46
| | | |
| * | | Merge branch 'feat/shop' into piernovpiernov2016-04-2413-15/+370
| |\ \ \ | | | |/ | | |/|
| | * | Add css/craftmine.csspiernov2016-04-241-0/+9
| | | |