| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'alexichi' into feat/gui | piernov | 2016-05-07 | 4 | -19/+129 |
| |\ | |||||
| | * | Merge branch 'feat/savegame' into alexichi | piernov | 2016-05-07 | 2 | -3/+21 |
| | |\ | |||||
| | * | | add the use of the life bottle | alexichi | 2016-05-07 | 3 | -3/+20 |
| | | | | |||||
| | * | | add the display of the perso characteristics below the title | alexichi | 2016-05-07 | 2 | -6/+14 |
| | | | | |||||
| | * | | add xp system and perso server side | alexichi | 2016-05-05 | 3 | -14/+42 |
| | | | | |||||
| | * | | add dungeon server side and improve some details like the difference between ↵ | alexichi | 2016-05-05 | 2 | -16/+73 |
| | | | | | | | | | | | | | floors | ||||
| * | | | UI improvements | piernov | 2016-05-07 | 1 | -2/+2 |
| | | | | |||||
| * | | | btn-primary → btn-success | piernov | 2016-05-07 | 2 | -9/+7 |
| | | | | |||||
| * | | | Change save buttons layout | piernov | 2016-05-07 | 1 | -1/+7 |
| | | | | |||||
| * | | | Move onhashchange event hook from XHTML to JavaScript | piernov | 2016-05-04 | 1 | -3/+4 |
| | | | | | | | | | | | | | Add some comments | ||||
| * | | | Merge branch 'feat/savegame' into piernov | piernov | 2016-05-04 | 2 | -3/+21 |
| |\ \ \ | |/ / |/| / | |/ | |||||
| | * | Don't send content-type when uploading file + update saves list when loading ↵ | piernov | 2016-05-04 | 1 | -2/+3 |
| | | | | | | | | | page | ||||
| | * | AJAX upload file | piernov | 2016-05-04 | 1 | -1/+18 |
| | | | |||||
| * | | Merge branch 'master' into alexichi | piernov | 2016-05-03 | 3 | -6/+50 |
| |\ \ | |||||
| | * | | Merge branch 'feat/savegame' into piernov | piernov | 2016-05-03 | 3 | -12/+44 |
| | |\| | |||||
| | | * | Allow multiple classes on tabs | piernov | 2016-05-02 | 1 | -4/+2 |
| | | | | |||||
| | | * | Add ability to delete a save | piernov | 2016-05-02 | 1 | -0/+3 |
| | | | | | | | | | | | | | Doesn't work because idk which method to use and I don't have the PHP doc right now | ||||
| | | * | Add various JS functions to work with game save | piernov | 2016-05-02 | 1 | -0/+32 |
| | | | | |||||
| | | * | Move saveGame()/downGame() to its own JS file | piernov | 2016-05-02 | 2 | -8/+7 |
| | | | | |||||
| | * | | 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 |
| | | | |||||
| * | | fix shop item count | alexichi | 2016-05-02 | 1 | -4/+5 |
| | | | |||||
| * | | Add dungeon without fight system | alexichi | 2016-05-01 | 2 | -4/+31 |
| | | | | | | | | | | | | | 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 dungeon | alexichi | 2016-05-01 | 1 | -0/+18 |
| | | | | | | | | | | | | | 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 well | alexichi | 2016-04-29 | 1 | -6/+13 |
| | | | |||||
| * | | add loadShop() and categories in the xml file and modify the presentation of ↵ | alexichi | 2016-04-27 | 1 | -8/+16 |
| |/ | | | | the items in the shop | ||||
| * | change class of Hire a Miner, and change type submit to button for items | alexichi | 2016-04-25 | 1 | -1/+1 |
| | | |||||
| * | Mise en commun du shop et de la guilde | alexichi | 2016-04-25 | 2 | -19/+11 |
| | | |||||
| * | Merge remote-tracking branch 'origin/piernov' into alexichi | alexichi | 2016-04-25 | 3 | -5/+116 |
| |\ | | | | | | | | | | | Conflicts: craftmine.php index.xhtml | ||||
| | * | Display error received from server + switch to specified tab on load | piernov | 2016-04-24 | 1 | -0/+2 |
| | | | |||||
| | * | Add JS GUI helpers | piernov | 2016-04-24 | 1 | -0/+42 |
| | | | |||||
| | * | Add client side JS shop functions | piernov | 2016-04-24 | 2 | -3/+61 |
| | | | |||||
| | * | 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 |
| | | | |||||
| * | | remove useless files and add .gitignore to not see them again | alexichi | 2016-04-25 | 1 | -51/+0 |
| | | | |||||
| * | | Add the guild | alexichi | 2016-04-25 | 1 | -8/+16 |
| | | | | | | | | | | | | | 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 alexichi | alexichi | 2016-04-25 | 1 | -12/+15 |
| |\| | | | | | | | | | Conflicts: js/craftmine.js | ||||
| | * | 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 |
| | | | |||||
| * | | add file for the guild ,client side (not finish) | alexichi | 2016-04-23 | 1 | -0/+18 |
| |/ | |||||
| * | mise du parseInt et mise à jour mots anglais | alexichi | 2016-04-21 | 2 | -0/+102 |
| | | |||||
| * | Add empty JS | alexichi | 2016-04-20 | 1 | -0/+0 |
 |
index : candybox | |
| [no description] |
| aboutsummaryrefslogtreecommitdiffstats |