| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'feat/savegame' of piernov.org:/srv/git/candybox into feat/savegame | piernov | 2016-05-02 | 2 | -3/+3 |
| |\ | |||||
| | * | Better when error/info messages aren't swapped | piernov | 2016-05-02 | 2 | -3/+3 |
| | | | |||||
| * | | Allow multiple classes on tabs | piernov | 2016-05-02 | 1 | -4/+2 |
| |/ | |||||
| * | Better when the user isn't allowed of deleting arbitrary files… | piernov | 2016-05-02 | 1 | -2/+3 |
| | | | | | Thanks PHP for not highligthing the problem and not providing simple solution… | ||||
| * | Fix delete save game | piernov | 2016-05-02 | 1 | -1/+1 |
| | | | | | | Yep, it was called unlink(). Who would've thought of that? Also, let's use the right operator and not fall for Javascript's silliness | ||||
| * | Add ability to delete a save | piernov | 2016-05-02 | 4 | -0/+13 |
| | | | | | Doesn't work because idk which method to use and I don't have the PHP doc right now | ||||
| * | Add Save tab | piernov | 2016-05-02 | 1 | -3/+11 |
| | | |||||
| * | 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 | 3 | -8/+8 |
| | | |||||
| * | Fix game save XML generation + add ability to send a previously generated ↵ | piernov | 2016-05-02 | 1 | -17/+27 |
| | | | | | game save | ||||
| * | Implement loading saved games on server | piernov | 2016-05-01 | 4 | -0/+37 |
| | | |||||
| * | Add data/save directory | piernov | 2016-04-27 | 1 | -0/+1 |
| | | |||||
| * | Add savegame.inc with methods for saving the game | piernov | 2016-04-27 | 1 | -0/+44 |
| | | |||||
| * | Savegame PHP action handling | piernov | 2016-04-27 | 1 | -0/+3 |
| | | |||||
| * | Add messages for savegame | piernov | 2016-04-27 | 1 | -1/+4 |
| | | |||||
| * | Add addToXML() methods on Inventory and Item objects | piernov | 2016-04-27 | 2 | -0/+13 |
| | | |||||
| * | Merge branch 'feat/messages' into feat/savegame | piernov | 2016-04-27 | 1 | -2/+10 |
| |\ | |||||
| | * | Add sendInfo() from PHPfeat/messages | piernov | 2016-04-27 | 1 | -2/+10 |
| | | | |||||
| * | | Add button for saving on server/downloading the game | piernov | 2016-04-27 | 2 | -0/+10 |
| | | | |||||
| * | | Also handle GET request for op in craftmine.php | piernov | 2016-04-27 | 1 | -3/+7 |
| |/ | |||||
| * | Merge remote-tracking branch 'origin/alexichi' into piernov | piernov | 2016-04-25 | 13 | -77/+66 |
| |\ | |||||
| | * | change class of Hire a Miner, and change type submit to button for items | alexichi | 2016-04-25 | 2 | -2/+2 |
| | | | |||||
| | * | Mise en commun du shop et de la guilde | alexichi | 2016-04-25 | 6 | -34/+30 |
| | | | |||||
| | * | Merge remote-tracking branch 'origin/piernov' into alexichi | alexichi | 2016-04-25 | 22 | -1636/+417 |
| | |\ | | | | | | | | | | | | | | | | Conflicts: craftmine.php index.xhtml | ||||
| | * | | remove useless files and add .gitignore to not see them again | alexichi | 2016-04-25 | 3 | -71/+1 |
| | | | | |||||
| | * | | Add the guild | alexichi | 2016-04-25 | 3 | -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 alexichi | alexichi | 2016-04-25 | 2 | -15/+19 |
| | |\ \ | | | | | | | | | | | | | | | | | Conflicts: js/craftmine.js | ||||
| | * | | | nothing special | alexichi | 2016-04-24 | 1 | -2/+2 |
| | | | | | |||||
| | * | | | 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 |
| | | | | | |||||
| | * | | | add file for server side | alexichi | 2016-04-23 | 1 | -0/+29 |
| | | | | | |||||
| | * | | | add 2 buttons for createGuild and hireMiner | alexichi | 2016-04-23 | 1 | -2/+7 |
| | | | | | |||||
| | * | | | add require_once and some cases of the switch | alexichi | 2016-04-23 | 1 | -0/+3 |
| | | | | | |||||
| * | | | | Add Symbola font for items icons | piernov | 2016-04-25 | 2 | -0/+6 |
| | | | | | |||||
| * | | | | Merge branch 'feat/shop' into piernov | piernov | 2016-04-25 | 1 | -1/+0 |
| |\ \ \ \ | |_|_|/ |/| | | | |||||
| | * | | | Account already debitedfeat/shop | piernov | 2016-04-25 | 1 | -1/+0 |
| | | | | | |||||
| * | | | | Merge branch 'feat/shop' into piernov | piernov | 2016-04-24 | 1 | -0/+1 |
| |\| | | | |||||
| | * | | | Include PHP inc/craftmine.php | piernov | 2016-04-24 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Merge branch 'doc' into piernov | piernov | 2016-04-24 | 8 | -1601/+46 |
| |\ \ \ \ | |||||
| | * | | | | Update Proposition initiale | piernov | 2016-04-24 | 8 | -1601/+46 |
| | | |_|/ | |/| | | |||||
| * | | | | Merge branch 'feat/shop' into piernov | piernov | 2016-04-24 | 13 | -15/+370 |
| |\ \ \ \ | | |/ / | |/| | | |||||
| | * | | | Add css/craftmine.css | piernov | 2016-04-24 | 1 | -0/+9 |
| | | | | | |||||
| | * | | | Rewrote index.xhtml: GUI rework | piernov | 2016-04-24 | 1 | -6/+72 |
| | | | | | |||||
| | * | | | 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 |
| | | | | | |||||
| | * | | | Send gold, shop and inventory infos from PHP all at once when requested on ↵ | piernov | 2016-04-24 | 3 | -2/+16 |
| | | | | | | | | | | | | | | | | | loading by client | ||||
| | * | | | json_encode() PHP gold amount sent to client | piernov | 2016-04-24 | 1 | -1/+1 |
| | | | | | |||||
 |
index : candybox | |
| [no description] |
| aboutsummaryrefslogtreecommitdiffstats |