aboutsummaryrefslogtreecommitdiffstats
path: root/js/craftmine.js
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into alexichipiernov2016-05-031-2/+6
|\
| * Merge branch 'feat/savegame' into piernovpiernov2016-05-031-8/+0
| |\
| | * Move saveGame()/downGame() to its own JS filepiernov2016-05-021-8/+0
| * | Force reset mine on game reloadpiernov2016-05-021-1/+2
| * | Allow empty data from serverpiernov2016-05-021-1/+2
| * | Merge branch 'feat/savegame' into piernovpiernov2016-04-271-0/+8
| |\|
| | * Add button for saving on server/downloading the gamepiernov2016-04-271-0/+8
| * | Automatically show received infopiernov2016-04-271-0/+2
| |/
* | add dungeon client side to display it when reloadalexichi2016-05-031-0/+1
* | Add dungeon without fight systemalexichi2016-05-011-1/+4
|/
* Mise en commun du shop et de la guildealexichi2016-04-251-1/+2
* Merge remote-tracking branch 'origin/piernov' into alexichialexichi2016-04-251-5/+17
|\
| * Display error received from server + switch to specified tab on loadpiernov2016-04-241-0/+2
| * Add client side JS shop functionspiernov2016-04-241-3/+4
| * Decode JSON before calling callback and prevent call in case of errorpiernov2016-04-241-3/+7
| * Add JS debitAccount() helperpiernov2016-04-241-0/+5
* | Merge branch 'master' of piernov.org:candybox into alexichialexichi2016-04-251-12/+15
|\|
| * Fix Mine setup/updatepiernov2016-04-231-7/+10
| * Spelling mistake: datas→datapiernov2016-04-231-11/+11
* | nothing specialalexichi2016-04-241-2/+2
|/
* mise du parseInt et mise à jour mots anglaisalexichi2016-04-211-0/+51
* Add empty JSalexichi2016-04-201-0/+0