aboutsummaryrefslogtreecommitdiffstats
path: root/inc
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'feat/savegame' into alexichipiernov2016-05-072-5/+29
|\
| * Receive uploaded savegame from PHPpiernov2016-05-042-0/+23
| |
| * Now possible to add format to sendMessage() stringspiernov2016-05-041-5/+6
| |
* | add the use of the life bottlealexichi2016-05-073-1/+24
| |
* | add the display of the perso characteristics below the titlealexichi2016-05-071-3/+9
| |
* | add xp system and perso server sidealexichi2016-05-054-3/+25
| |
* | add dungeon server side and improve some details like the difference between ↵alexichi2016-05-052-6/+13
| | | | | | | | floors
* | Merge branch 'master' into alexichipiernov2016-05-036-5/+126
|\ \
| * | Merge branch 'feat/savegame' into piernovpiernov2016-05-033-16/+71
| |\|
| | * Better when error/info messages aren't swappedpiernov2016-05-022-3/+3
| | |
| | * 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-022-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 ↵piernov2016-05-021-17/+27
| | | | | | | | | | | | game save
| | * Implement loading saved games on serverpiernov2016-05-013-0/+35
| | |
| * | Remove useless mine.mine inpiernov2016-04-271-1/+1
| |/
| * Add savegame.inc with methods for saving the gamepiernov2016-04-271-0/+44
| |
| * Add messages for savegamepiernov2016-04-271-1/+4
| |
| * Add addToXML() methods on Inventory and Item objectspiernov2016-04-272-0/+13
| |
| * Add sendInfo() from PHPfeat/messagespiernov2016-04-271-2/+10
| |
| * Merge remote-tracking branch 'origin/alexichi' into piernovpiernov2016-04-256-22/+36
| |\
| * | Account already debitedfeat/shoppiernov2016-04-251-1/+0
| | |
* | | add dungeon client side to display it when reloadalexichi2016-05-032-1/+9
| | |
* | | fix shop item countalexichi2016-05-021-4/+4
| | |
* | | Add dungeon without fight systemalexichi2016-05-011-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 dungeonalexichi2016-05-013-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 wellalexichi2016-04-292-4/+14
| | |
* | | add loadShop() and categories in the xml file and modify the presentation of ↵alexichi2016-04-271-15/+21
| |/ |/| | | | | the items in the shop
* | Mise en commun du shop et de la guildealexichi2016-04-254-15/+19
| |
* | Merge remote-tracking branch 'origin/piernov' into alexichialexichi2016-04-257-2/+166
|\| | | | | | | | | | | Conflicts: craftmine.php index.xhtml
| * Send gold, shop and inventory infos from PHP all at once when requested on ↵piernov2016-04-242-1/+15
| | | | | | | | loading by client
| * json_encode() PHP gold amount sent to clientpiernov2016-04-241-1/+1
| |
| * Add PHP shop requests handlerspiernov2016-04-241-0/+59
| |
| * Add debit/creditAccount() PHP account management helperspiernov2016-04-241-0/+18
| |
| * Add PHP Inventory classpiernov2016-04-241-0/+41
| |
| * Add PHP Item classpiernov2016-04-241-0/+17
| |
| * Add sendError() PHP error message helperpiernov2016-04-241-0/+15
| |
* | remove useless files and add .gitignore to not see them againalexichi2016-04-251-20/+0
| |
* | Add the guildalexichi2016-04-251-9/+10
| | | | | | | | | | | | add buttons to hireMiner and purchase the guild on xhtml javascript send request to the server php -> update $_SESSION for miner
* | Merge branch 'master' of piernov.org:candybox into alexichialexichi2016-04-251-3/+4
|\| | | | | | | | | Conflicts: js/craftmine.js
| * Fix Mine setup/updatepiernov2016-04-231-4/+5
| |
* | nothing specialalexichi2016-04-241-2/+2
| |
* | add file for server sidealexichi2016-04-231-0/+29
|/
* Mise à jour des mots en anglaisalexichi2016-04-212-0/+40
suppression de la méthode update mine