| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/piernov' into alexichi | alexichi | 2016-04-25 | 7 | -2/+166 |
| |\| | | | | | | | | | | | Conflicts: craftmine.php index.xhtml | ||||
| | * | Send gold, shop and inventory infos from PHP all at once when requested on ↵ | piernov | 2016-04-24 | 2 | -1/+15 |
| | | | | | | | | | loading by client | ||||
| | * | json_encode() PHP gold amount sent to client | piernov | 2016-04-24 | 1 | -1/+1 |
| | | | |||||
| | * | Add PHP shop requests handlers | piernov | 2016-04-24 | 1 | -0/+59 |
| | | | |||||
| | * | Add debit/creditAccount() PHP account management helpers | piernov | 2016-04-24 | 1 | -0/+18 |
| | | | |||||
| | * | Add PHP Inventory class | piernov | 2016-04-24 | 1 | -0/+41 |
| | | | |||||
| | * | Add PHP Item class | piernov | 2016-04-24 | 1 | -0/+17 |
| | | | |||||
| | * | Add sendError() PHP error message helper | piernov | 2016-04-24 | 1 | -0/+15 |
| | | | |||||
| * | | remove useless files and add .gitignore to not see them again | alexichi | 2016-04-25 | 1 | -20/+0 |
| | | | |||||
| * | | Add the guild | alexichi | 2016-04-25 | 1 | -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 alexichi | alexichi | 2016-04-25 | 1 | -3/+4 |
| |\| | | | | | | | | | Conflicts: js/craftmine.js | ||||
| | * | Fix Mine setup/update | piernov | 2016-04-23 | 1 | -4/+5 |
| | | | |||||
| * | | nothing special | alexichi | 2016-04-24 | 1 | -2/+2 |
| | | | |||||
| * | | add file for server side | alexichi | 2016-04-23 | 1 | -0/+29 |
| |/ | |||||
| * | Mise à jour des mots en anglais | alexichi | 2016-04-21 | 2 | -0/+40 |
| suppression de la méthode update mine | |||||
 |
index : candybox | |
| [no description] |
| aboutsummaryrefslogtreecommitdiffstats |