aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | 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
* | | | add the beginning part of the dungeonalexichi2016-05-017-2/+146
* | | | 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
| |_|/ |/| |
* | | 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
|\| |
| * | 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
| | * | Rewrote index.xhtml: GUI reworkpiernov2016-04-241-6/+72
| | * | Display error received from server + switch to specified tab on loadpiernov2016-04-241-0/+2
| | * | Add JS GUI helperspiernov2016-04-241-0/+42
| | * | Add client side JS shop functionspiernov2016-04-242-3/+61
| | * | Decode JSON before calling callback and prevent call in case of errorpiernov2016-04-241-3/+7
| | * | Add JS debitAccount() helperpiernov2016-04-241-0/+5
| | * | Send gold, shop and inventory infos from PHP all at once when requested on lo...piernov2016-04-243-2/+16
| | * | json_encode() PHP gold amount sent to clientpiernov2016-04-241-1/+1
| | * | Move session_start() after all requires (needed for classes to work correctly...piernov2016-04-241-1/+2
| | * | Add shop related PHP request handlingpiernov2016-04-241-0/+4
| | * | 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
| | |/
| * / Add .htaccess for using index.xhtml as DirectoryIndexpiernov2016-04-241-0/+1
| |/
* | remove useless files and add .gitignore to not see them againalexichi2016-04-253-71/+1
* | Add the guildalexichi2016-04-253-20/+49
* | Merge branch 'master' of piernov.org:candybox into alexichialexichi2016-04-252-15/+19
|\|
| * Fix Mine setup/updatepiernov2016-04-232-11/+15
| * Spelling mistake: datas→datapiernov2016-04-231-11/+11
* | nothing specialalexichi2016-04-241-2/+2
* | nothing specialalexichi2016-04-241-2/+2
* | add file for the guild ,client side (not finish)alexichi2016-04-231-0/+18
* | add file for server sidealexichi2016-04-231-0/+29