aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \
| * | continue the use of objects problemalexichi2016-05-104-9/+50
* | | Merge branch 'alexichi' of ssh://piernov.org/srv/git/candybox into alexichipiernov2016-05-0925-114/+1022
|\| |
| * | 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
| * | | Switch to HTML5 Doctype + remove useless Content-Type http-equivpiernov2016-05-041-3/+1
| * | | Form → listpiernov2016-05-041-4/+4
| * | | Move onhashchange event hook from XHTML to JavaScriptpiernov2016-05-042-4/+5
| * | | Remove useless role attributeépiernov2016-05-041-5/+5
| * | | Remove useless data-toggle attributepiernov2016-05-041-5/+5
| * | | Merge branch 'feat/savegame' into piernovpiernov2016-05-046-10/+60
| |\ \ \ | | | |/ | | |/|
| | * | Don't send content-type when uploading file + update saves list when loading ...piernov2016-05-041-2/+3
| | * | PHP front page for uploadpiernov2016-05-041-0/+6
| | * | AJAX upload filepiernov2016-05-041-1/+18
| | * | Receive uploaded savegame from PHPpiernov2016-05-042-0/+23
| | * | Now possible to add format to sendMessage() stringspiernov2016-05-041-5/+6
generated by cgit v1.2.3-70-g09d2 (git 2.47.0) at 2024-11-22 01:13:05 +0000