aboutsummaryrefslogtreecommitdiffstats
path: root/js
Commit message (Expand)AuthorAgeFilesLines
* Revert "add id to item in order to change the value client side"piernov2016-05-081-1/+1
* Merge branch 'piernov' into alexichipiernov2016-05-081-4/+5
|\
| * Update save list on save and upload + fix get checked save with new layoutpiernov2016-05-081-4/+5
* | add id to item in order to change the value client sidealexichi2016-05-071-1/+1
|/
* btn-primary → btn-successpiernov2016-05-071-2/+2
* Merge branch 'alexichi' into feat/guipiernov2016-05-074-19/+129
|\
| * Merge branch 'feat/savegame' into alexichipiernov2016-05-072-3/+21
| |\
| * | add the use of the life bottlealexichi2016-05-073-3/+20
| * | add the display of the perso characteristics below the titlealexichi2016-05-072-6/+14
| * | add xp system and perso server sidealexichi2016-05-053-14/+42
| * | add dungeon server side and improve some details like the difference between ...alexichi2016-05-052-16/+73
* | | UI improvementspiernov2016-05-071-2/+2
* | | btn-primary → btn-successpiernov2016-05-072-9/+7
* | | Change save buttons layoutpiernov2016-05-071-1/+7
* | | Move onhashchange event hook from XHTML to JavaScriptpiernov2016-05-041-3/+4
* | | Merge branch 'feat/savegame' into piernovpiernov2016-05-042-3/+21
|\ \ \ | |/ / |/| / | |/
| * Don't send content-type when uploading file + update saves list when loading ...piernov2016-05-041-2/+3
| * AJAX upload filepiernov2016-05-041-1/+18
* | Merge branch 'master' into alexichipiernov2016-05-033-6/+50
|\ \
| * | Merge branch 'feat/savegame' into piernovpiernov2016-05-033-12/+44
| |\|
| | * Allow multiple classes on tabspiernov2016-05-021-4/+2
| | * Add ability to delete a savepiernov2016-05-021-0/+3
| | * Add various JS functions to work with game savepiernov2016-05-021-0/+32
| | * Move saveGame()/downGame() to its own JS filepiernov2016-05-022-8/+7
| * | 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
* | fix shop item countalexichi2016-05-021-4/+5
* | Add dungeon without fight systemalexichi2016-05-012-4/+31
* | add the beginning part of the dungeonalexichi2016-05-011-0/+18
* | add the option to not create 2 objects of the same type, doesn't work wellalexichi2016-04-291-6/+13
* | add loadShop() and categories in the xml file and modify the presentation of ...alexichi2016-04-271-8/+16
|/
* change class of Hire a Miner, and change type submit to button for itemsalexichi2016-04-251-1/+1
* Mise en commun du shop et de la guildealexichi2016-04-252-19/+11
* Merge remote-tracking branch 'origin/piernov' into alexichialexichi2016-04-253-5/+116
|\
| * 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
* | remove useless files and add .gitignore to not see them againalexichi2016-04-251-51/+0
* | Add the guildalexichi2016-04-251-8/+16
* | 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
* | add file for the guild ,client side (not finish)alexichi2016-04-231-0/+18
|/