| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| * | Merge branch 'alexichi' into feat/gui | piernov | 2016-05-07 | 1 | -4/+14 |
| |\ |
|
| | * | Merge branch 'feat/savegame' into alexichi | piernov | 2016-05-07 | 1 | -2/+3 |
| | |\ |
|
| | * | | add the use of the life bottle | alexichi | 2016-05-07 | 1 | -1/+1 |
| | * | | add the display of the perso characteristics below the title | alexichi | 2016-05-07 | 1 | -1/+1 |
| | * | | add xp system and perso server side | alexichi | 2016-05-05 | 1 | -2/+11 |
| | * | | add dungeon server side and improve some details like the difference between ... | alexichi | 2016-05-05 | 1 | -3/+4 |
| * | | | Move onhashchange event hook from XHTML to JavaScript | piernov | 2016-05-04 | 1 | -3/+4 |
| * | | | Merge branch 'feat/savegame' into piernov | piernov | 2016-05-04 | 1 | -2/+3 |
| |\ \ \
| |/ /
|/| /
| |/ |
|
| | * | Don't send content-type when uploading file + update saves list when loading ... | piernov | 2016-05-04 | 1 | -2/+3 |
| * | | Merge branch 'master' into alexichi | piernov | 2016-05-03 | 1 | -2/+6 |
| |\ \ |
|
| | * | | Merge branch 'feat/savegame' into piernov | piernov | 2016-05-03 | 1 | -8/+0 |
| | |\| |
|
| | | * | Move saveGame()/downGame() to its own JS file | piernov | 2016-05-02 | 1 | -8/+0 |
| | * | | Force reset mine on game reload | piernov | 2016-05-02 | 1 | -1/+2 |
| | * | | Allow empty data from server | piernov | 2016-05-02 | 1 | -1/+2 |
| | * | | Merge branch 'feat/savegame' into piernov | piernov | 2016-04-27 | 1 | -0/+8 |
| | |\| |
|
| | | * | Add button for saving on server/downloading the game | piernov | 2016-04-27 | 1 | -0/+8 |
| | * | | Automatically show received info | piernov | 2016-04-27 | 1 | -0/+2 |
| | |/ |
|
| * | | add dungeon client side to display it when reload | alexichi | 2016-05-03 | 1 | -0/+1 |
| * | | Add dungeon without fight system | alexichi | 2016-05-01 | 1 | -1/+4 |
| |/ |
|
| * | Mise en commun du shop et de la guilde | alexichi | 2016-04-25 | 1 | -1/+2 |
| * | Merge remote-tracking branch 'origin/piernov' into alexichi | alexichi | 2016-04-25 | 1 | -5/+17 |
| |\ |
|
| | * | Display error received from server + switch to specified tab on load | piernov | 2016-04-24 | 1 | -0/+2 |
| | * | Add client side JS shop functions | piernov | 2016-04-24 | 1 | -3/+4 |
| | * | Decode JSON before calling callback and prevent call in case of error | piernov | 2016-04-24 | 1 | -3/+7 |
| | * | Add JS debitAccount() helper | piernov | 2016-04-24 | 1 | -0/+5 |
| * | | Merge branch 'master' of piernov.org:candybox into alexichi | alexichi | 2016-04-25 | 1 | -12/+15 |
| |\| |
|
| | * | Fix Mine setup/update | piernov | 2016-04-23 | 1 | -7/+10 |
| | * | Spelling mistake: datas→data | piernov | 2016-04-23 | 1 | -11/+11 |
| * | | nothing special | alexichi | 2016-04-24 | 1 | -2/+2 |
| |/ |
|
| * | mise du parseInt et mise à jour mots anglais | alexichi | 2016-04-21 | 1 | -0/+51 |
| * | Add empty JS | alexichi | 2016-04-20 | 1 | -0/+0 |
