aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of piernov.org:candybox into alexichialexichialexichi2016-05-11168-25/+30806
|\
| * Add reset current game buttonHEADmasterpiernov2016-05-104-0/+12
| * Dirty fix for messagepiernov2016-05-101-1/+4
| * Add footer to html pagepiernovpiernov2016-05-102-0/+22
| * Add LICENSE filepiernov2016-05-101-0/+66
| * Update phpdocpiernov2016-05-1025-504/+792
| * Fix spelling mistake on dungeon endpiernov2016-05-101-3/+3
| * Merge branch 'alexichi' into piernovpiernov2016-05-104-6/+24
| |\
| | * Various fixespiernov2016-05-104-6/+24
| * | Merge branch 'phpdoc' into piernovpiernov2016-05-10162-16/+30390
| |\ \ | | |/ | |/|
| | * Finish Inventory PHPDocphpdocpiernov2016-05-0926-630/+545
| | * Add build_doc.sh script + generated phpdocpiernov2016-05-08150-0/+30014
| | * Add @package and various fixespiernov2016-05-0812-11/+24
| | * First PHPDoc push, Inventory not completepiernov2016-05-0812-19/+449
| * | Merge branch 'alexichi' of /srv/git/candybox into alexichipiernov2016-05-104-9/+50
| |\ \
| * \ \ Merge branch 'alexichi' of ssh://piernov.org/srv/git/candybox into alexichipiernov2016-05-0925-114/+1022
| |\ \ \
| * \ \ \ Merge branch 'alexichi' of ssh://piernov.org/srv/git/candybox into alexichipiernov2016-04-2527-1721/+457
| |\ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'origin/master' into alexichipiernov2016-04-242-16/+20
| |\ \ \ \ \
* | | | | | | add longevity feature to itemsalexichi2016-05-112-7/+17
* | | | | | | correct bonusPower namealexichi2016-05-112-6/+7
| |_|_|_|/ / |/| | | | |
* | | | | | continue the use of objects problemalexichi2016-05-104-9/+50
| |_|_|/ / |/| | | |
* | | | | add the use of the objects and the feature power and maxHPalexichi2016-05-0912-46/+140
| |_|_|/ |/| | |
* | | | Fix Item deletion in Inventory againpiernov2016-05-081-3/+2
* | | | Items feature support on save/load gamefeat/savegamepiernov2016-05-081-1/+8
* | | | Fix Inventory display on page loadpiernov2016-05-081-2/+3
* | | | Rewrite JS useItem() to be able to consume Item using properties from XML and...piernov2016-05-081-17/+11
* | | | Read features from XML + send updated perso stats on useItem()piernov2016-05-081-2/+11
* | | | Fix Item deletion in Inventory + add call to consume()piernov2016-05-081-5/+15
* | | | Add feature attribute to Item class + add consume() method to use those featu...piernov2016-05-082-4/+24
* | | | Create updatePerso() JS functionpiernov2016-05-082-6/+8
* | | | Add features hp+3 to Life Bottlepiernov2016-05-081-1/+3
* | | | Revert "add id to item in order to change the value client side"piernov2016-05-081-1/+1
* | | | Merge branch 'piernov' into alexichipiernov2016-05-085-7/+18
|\ \ \ \
| * \ \ \ Merge branch 'feat/savegame' into piernovpiernov2016-05-084-7/+14
| |\ \ \ \
| | * | | | Update save list on save and upload + fix get checked save with new layoutpiernov2016-05-081-4/+5
| | * | | | Add multiple item support to savegame + fix missing includespiernov2016-05-083-3/+9
| * | | | | Fix height/width for item button in inventory tabfeat/guipiernov2016-05-081-0/+4
| |/ / / /
* / / / / add id to item in order to change the value client sidealexichi2016-05-071-1/+1
|/ / / /
* | | | btn-primary → btn-successpiernov2016-05-071-2/+2
* | | | Character UIpiernov2016-05-071-3/+6
* | | | Merge branch 'alexichi' into feat/guipiernov2016-05-0714-29/+216
|\ \ \ \
| * \ \ \ Merge branch 'feat/savegame' into alexichipiernov2016-05-076-10/+60
| |\ \ \ \
| * | | | | add the use of the life bottlealexichi2016-05-077-4/+45
| * | | | | add the display of the perso characteristics below the titlealexichi2016-05-073-9/+23
| * | | | | add xp system and perso server sidealexichi2016-05-0510-17/+83
| * | | | | add dungeon server side and improve some details like the difference between ...alexichi2016-05-057-25/+90
* | | | | | UI improvementspiernov2016-05-073-51/+107
* | | | | | btn-primary → btn-successpiernov2016-05-072-9/+7
* | | | | | Change save buttons layoutpiernov2016-05-071-1/+7
* | | | | | Use default Bootstrap CSSpiernov2016-05-071-8/+3
generated by cgit v1.2.3-54-g00ecf (git 2.44.0) at 2024-04-24 16:28:33 +0000