| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' of piernov.org:candybox into alexichialexichi | alexichi | 2016-05-11 | 168 | -25/+30806 |
| |\ | | | | | | | | | Conflicts: inc/perso.inc | ||||
| | * | Add reset current game buttonHEADmaster | piernov | 2016-05-10 | 4 | -0/+12 |
| | | | |||||
| | * | Dirty fix for message | piernov | 2016-05-10 | 1 | -1/+4 |
| | | | |||||
| | * | Add footer to html pagepiernov | piernov | 2016-05-10 | 2 | -0/+22 |
| | | | |||||
| | * | Add LICENSE file | piernov | 2016-05-10 | 1 | -0/+66 |
| | | | |||||
| | * | Update phpdoc | piernov | 2016-05-10 | 25 | -504/+792 |
| | | | |||||
| | * | Fix spelling mistake on dungeon end | piernov | 2016-05-10 | 1 | -3/+3 |
| | | | |||||
| | * | Merge branch 'alexichi' into piernov | piernov | 2016-05-10 | 4 | -6/+24 |
| | |\ | |||||
| | | * | Various fixes | piernov | 2016-05-10 | 4 | -6/+24 |
| | | | | |||||
| | * | | Merge branch 'phpdoc' into piernov | piernov | 2016-05-10 | 162 | -16/+30390 |
| | |\ \ | | |/ | |/| | |||||
| | | * | Finish Inventory PHPDocphpdoc | piernov | 2016-05-09 | 26 | -630/+545 |
| | | | | |||||
| | | * | Add build_doc.sh script + generated phpdoc | piernov | 2016-05-08 | 150 | -0/+30014 |
| | | | | |||||
| | | * | Add @package and various fixes | piernov | 2016-05-08 | 12 | -11/+24 |
| | | | | |||||
| | | * | First PHPDoc push, Inventory not complete | piernov | 2016-05-08 | 12 | -19/+449 |
| | | | | |||||
| | * | | Merge branch 'alexichi' of /srv/git/candybox into alexichi | piernov | 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 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge branch 'alexichi' of ssh://piernov.org/srv/git/candybox into alexichi | piernov | 2016-04-25 | 27 | -1721/+457 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge remote-tracking branch 'origin/master' into alexichi | piernov | 2016-04-24 | 2 | -16/+20 |
| | |\ \ \ \ \ | |||||
| * | | | | | | | add longevity feature to items | alexichi | 2016-05-11 | 2 | -7/+17 |
| | | | | | | | | |||||
| * | | | | | | | correct bonusPower name | alexichi | 2016-05-11 | 2 | -6/+7 |
| | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | | continue the use of objects problem | alexichi | 2016-05-10 | 4 | -9/+50 |
| | |_|_|/ / |/| | | | | |||||
| * | | | | | 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 |
| | | | | | | | |||||
 |
index : candybox | |
| [no description] |
| aboutsummaryrefslogtreecommitdiffstats |