aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add dungeon without fight systemalexichi2016-05-015-6/+46
| | | | | | 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-017-2/+146
| | | | | | 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-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
| | | | the items in the shop
* 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
|\ | | | | | | | | | | Conflicts: craftmine.php index.xhtml
| * 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 ↵piernov2016-04-243-2/+16
| | | | | | | | | | | | | | | | loading by client
| | * | json_encode() PHP gold amount sent to clientpiernov2016-04-241-1/+1
| | | |
| | * | Move session_start() after all requires (needed for classes to work ↵piernov2016-04-241-1/+2
| | | | | | | | | | | | | | | | correctly in $_SESSION)
| | * | 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
| | | | | | | | | | | | 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-252-15/+19
|\| | | | | | | | | Conflicts: js/craftmine.js
| * 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
| |
* | add 2 buttons for createGuild and hireMineralexichi2016-04-231-2/+7
| |
* | add require_once and some cases of the switchalexichi2016-04-231-0/+3
|/
* Add Proposition initiale documentpiernov2016-04-218-0/+1890
|
* mise du parseInt et mise à jour mots anglaisalexichi2016-04-212-0/+102
|
* modification du chemin du fichier jsalexichi2016-04-211-5/+5
|
* suppression d'un case du switchalexichi2016-04-211-0/+10
|
* Mise à jour des mots en anglaisalexichi2016-04-212-0/+40
| | | | suppression de la méthode update mine
* Update index.xhtmlalexichi2016-04-201-4/+13
|
* Add main PHP scriptalexichi2016-04-201-0/+29
|
* Add empty JSalexichi2016-04-201-0/+0
|
* Add Bootstrap CSSalexichi2016-04-201-0/+11
|