Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Various fixes | piernov | 2016-05-10 | 4 | -6/+24 |
| | |||||
* | Merge branch 'alexichi' of /srv/git/candybox into alexichi | piernov | 2016-05-10 | 4 | -9/+50 |
|\ | |||||
| * | continue the use of objects problem | alexichi | 2016-05-10 | 4 | -9/+50 |
| | | |||||
* | | Merge branch 'alexichi' of ssh://piernov.org/srv/git/candybox into alexichi | piernov | 2016-05-09 | 25 | -114/+1022 |
|\| | |||||
| * | add the use of the objects and the feature power and maxHP | alexichi | 2016-05-09 | 12 | -46/+140 |
| | | |||||
| * | Fix Item deletion in Inventory again | piernov | 2016-05-08 | 1 | -3/+2 |
| | | |||||
| * | Items feature support on save/load gamefeat/savegame | piernov | 2016-05-08 | 1 | -1/+8 |
| | | |||||
| * | Fix Inventory display on page load | piernov | 2016-05-08 | 1 | -2/+3 |
| | | |||||
| * | Rewrite JS useItem() to be able to consume Item using properties from XML ↵ | piernov | 2016-05-08 | 1 | -17/+11 |
| | | | | | | | | and to delete Item | ||||
| * | Read features from XML + send updated perso stats on useItem() | piernov | 2016-05-08 | 1 | -2/+11 |
| | | |||||
| * | Fix Item deletion in Inventory + add call to consume() | piernov | 2016-05-08 | 1 | -5/+15 |
| | | |||||
| * | Add feature attribute to Item class + add consume() method to use those ↵ | piernov | 2016-05-08 | 2 | -4/+24 |
| | | | | | | | | features + use coercion on updatePerso() values | ||||
| * | Create updatePerso() JS function | piernov | 2016-05-08 | 2 | -6/+8 |
| | | |||||
| * | Add features hp+3 to Life Bottle | piernov | 2016-05-08 | 1 | -1/+3 |
| | | |||||
| * | Revert "add id to item in order to change the value client side" | piernov | 2016-05-08 | 1 | -1/+1 |
| | | | | | | | | This reverts commit 3795b462a30a1942f5ebac3105e72824acbd1a87. | ||||
| * | Merge branch 'piernov' into alexichi | piernov | 2016-05-08 | 5 | -7/+18 |
| |\ | |||||
| | * | Merge branch 'feat/savegame' into piernov | piernov | 2016-05-08 | 4 | -7/+14 |
| | |\ | |||||
| | | * | Update save list on save and upload + fix get checked save with new layout | piernov | 2016-05-08 | 1 | -4/+5 |
| | | | | |||||
| | | * | Add multiple item support to savegame + fix missing includes | piernov | 2016-05-08 | 3 | -3/+9 |
| | | | | |||||
| | * | | Fix height/width for item button in inventory tabfeat/gui | piernov | 2016-05-08 | 1 | -0/+4 |
| | |/ | |||||
| * / | add id to item in order to change the value client side | alexichi | 2016-05-07 | 1 | -1/+1 |
| |/ | |||||
| * | btn-primary → btn-success | piernov | 2016-05-07 | 1 | -2/+2 |
| | | |||||
| * | Character UI | piernov | 2016-05-07 | 1 | -3/+6 |
| | | |||||
| * | Merge branch 'alexichi' into feat/gui | piernov | 2016-05-07 | 14 | -29/+216 |
| |\ | |||||
| | * | Merge branch 'feat/savegame' into alexichi | piernov | 2016-05-07 | 6 | -10/+60 |
| | |\ | |||||
| | * | | add the use of the life bottle | alexichi | 2016-05-07 | 7 | -4/+45 |
| | | | | |||||
| | * | | add the display of the perso characteristics below the title | alexichi | 2016-05-07 | 3 | -9/+23 |
| | | | | |||||
| | * | | add xp system and perso server side | alexichi | 2016-05-05 | 10 | -17/+83 |
| | | | | |||||
| | * | | add dungeon server side and improve some details like the difference between ↵ | alexichi | 2016-05-05 | 7 | -25/+90 |
| | | | | | | | | | | | | | | | | floors | ||||
| * | | | UI improvements | piernov | 2016-05-07 | 3 | -51/+107 |
| | | | | |||||
| * | | | btn-primary → btn-success | piernov | 2016-05-07 | 2 | -9/+7 |
| | | | | |||||
| * | | | Change save buttons layout | piernov | 2016-05-07 | 1 | -1/+7 |
| | | | | |||||
| * | | | Use default Bootstrap CSS | piernov | 2016-05-07 | 1 | -8/+3 |
| | | | | |||||
| * | | | Switch to HTML5 Doctype + remove useless Content-Type http-equiv | piernov | 2016-05-04 | 1 | -3/+1 |
| | | | | |||||
| * | | | Form → list | piernov | 2016-05-04 | 1 | -4/+4 |
| | | | | |||||
| * | | | Move onhashchange event hook from XHTML to JavaScript | piernov | 2016-05-04 | 2 | -4/+5 |
| | | | | | | | | | | | | | | | | Add some comments | ||||
| * | | | Remove useless role attributeé | piernov | 2016-05-04 | 1 | -5/+5 |
| | | | | |||||
| * | | | Remove useless data-toggle attribute | piernov | 2016-05-04 | 1 | -5/+5 |
| | | | | |||||
| * | | | Merge branch 'feat/savegame' into piernov | piernov | 2016-05-04 | 6 | -10/+60 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Don't send content-type when uploading file + update saves list when loading ↵ | piernov | 2016-05-04 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | page | ||||
| | * | | PHP front page for upload | piernov | 2016-05-04 | 1 | -0/+6 |
| | | | | |||||
| | * | | AJAX upload file | piernov | 2016-05-04 | 1 | -1/+18 |
| | | | | |||||
| | * | | Receive uploaded savegame from PHP | piernov | 2016-05-04 | 2 | -0/+23 |
| | | | | |||||
| | * | | Now possible to add format to sendMessage() strings | piernov | 2016-05-04 | 1 | -5/+6 |
| | | | | |||||
| | * | | Add upload button for save + move save/download button | piernov | 2016-05-04 | 1 | -2/+4 |
| | | | | |||||
| * | | | Missing comma | piernov | 2016-05-04 | 1 | -1/+1 |
| | |/ | |/| | |||||
| * | | Merge branch 'master' into alexichi | piernov | 2016-05-03 | 14 | -18/+217 |
| |\ \ | |||||
| | * | | Merge branch 'feat/savegame' into piernov | piernov | 2016-05-03 | 8 | -31/+130 |
| | |\| | |||||
| | | * | 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 |
| | | | | |