Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of piernov.org:candybox into alexichialexichi | alexichi | 2016-05-11 | 1 | -2/+28 |
|\ | | | | | | | | | Conflicts: inc/perso.inc | ||||
| * | Merge branch 'phpdoc' into piernov | piernov | 2016-05-10 | 1 | -0/+28 |
| |\ | |||||
| | * | Add @package and various fixes | piernov | 2016-05-08 | 1 | -0/+1 |
| | | | |||||
| | * | First PHPDoc push, Inventory not complete | piernov | 2016-05-08 | 1 | -0/+27 |
| | | | |||||
* | | | add longevity feature to items | alexichi | 2016-05-11 | 1 | -7/+14 |
| | | | |||||
* | | | correct bonusPower name | alexichi | 2016-05-11 | 1 | -3/+4 |
|/ / | |||||
* | | continue the use of objects problem | alexichi | 2016-05-10 | 1 | -6/+39 |
| | | |||||
* | | add the use of the objects and the feature power and maxHP | alexichi | 2016-05-09 | 1 | -0/+33 |
|/ | |||||
* | Add feature attribute to Item class + add consume() method to use those ↵ | piernov | 2016-05-08 | 1 | -3/+10 |
| | | | | features + use coercion on updatePerso() values | ||||
* | 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 | -3/+9 |
| | |||||
* | add xp system and perso server side | alexichi | 2016-05-05 | 1 | -0/+17 |