aboutsummaryrefslogtreecommitdiffstats
path: root/inc
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/alexichi' into piernovpiernov2016-04-256-22/+36
|\
| * 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
| * | 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
| * | | nothing specialalexichi2016-04-241-2/+2
| | | |
| * | | add file for server sidealexichi2016-04-231-0/+29
| | | |
* | | | Account already debitedfeat/shoppiernov2016-04-251-1/+0
| |_|/ |/| |
* | | 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
| |/ |/|
* | Fix Mine setup/updatepiernov2016-04-231-4/+5
|/
* Mise à jour des mots en anglaisalexichi2016-04-212-0/+40
suppression de la méthode update mine