aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | Add upload button for save + move save/download buttonpiernov2016-05-041-2/+4
* | | Missing commapiernov2016-05-041-1/+1
| |/ |/|
* | Merge branch 'master' into alexichipiernov2016-05-0314-18/+217
|\ \
| * | Merge branch 'feat/savegame' into piernovpiernov2016-05-038-31/+130
| |\|
| | * Merge branch 'feat/savegame' of piernov.org:/srv/git/candybox into feat/savegamepiernov2016-05-022-3/+3
| | |\
| | | * Better when error/info messages aren't swappedpiernov2016-05-022-3/+3
| | * | Allow multiple classes on tabspiernov2016-05-021-4/+2
| | |/
| | * Better when the user isn't allowed of deleting arbitrary files…piernov2016-05-021-2/+3
| | * Fix delete save gamepiernov2016-05-021-1/+1
| | * Add ability to delete a savepiernov2016-05-024-0/+13
| | * Add Save tabpiernov2016-05-021-3/+11
| | * Add various JS functions to work with game savepiernov2016-05-021-0/+32
| | * Move saveGame()/downGame() to its own JS filepiernov2016-05-023-8/+8
| | * Fix game save XML generation + add ability to send a previously generated gam...piernov2016-05-021-17/+27
| | * Implement loading saved games on serverpiernov2016-05-014-0/+37