Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/alexichi' into piernov | piernov | 2016-04-25 | 6 | -22/+36 |
|\ | |||||
| * | 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 | ||||
| * | | 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 | ||||
| * | | | nothing special | alexichi | 2016-04-24 | 1 | -2/+2 |
| | | | | |||||
| * | | | add file for server side | alexichi | 2016-04-23 | 1 | -0/+29 |
| | | | | |||||
* | | | | Account already debitedfeat/shop | piernov | 2016-04-25 | 1 | -1/+0 |
| |_|/ |/| | | |||||
* | | | 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 |
| |/ |/| | |||||
* | | Fix Mine setup/update | piernov | 2016-04-23 | 1 | -4/+5 |
|/ | |||||
* | Mise à jour des mots en anglais | alexichi | 2016-04-21 | 2 | -0/+40 |
suppression de la méthode update mine |