aboutsummaryrefslogtreecommitdiffstats
path: root/inc
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of piernov.org:candybox into alexichialexichialexichi2016-05-1112-21/+516
|\
| * Add reset current game buttonHEADmasterpiernov2016-05-101-0/+4
| * Merge branch 'alexichi' into piernovpiernov2016-05-103-3/+21
| |\
| | * Various fixespiernov2016-05-103-3/+21
| * | Merge branch 'phpdoc' into piernovpiernov2016-05-1012-16/+491
| |\ \ | | |/ | |/|
| | * Finish Inventory PHPDocphpdocpiernov2016-05-091-3/+33
| | * Add @package and various fixespiernov2016-05-0812-11/+24
| | * First PHPDoc push, Inventory not completepiernov2016-05-0812-19/+449
* | | add longevity feature to itemsalexichi2016-05-111-7/+14
* | | correct bonusPower namealexichi2016-05-111-3/+4
|/ /
* | continue the use of objects problemalexichi2016-05-102-7/+41
* | add the use of the objects and the feature power and maxHPalexichi2016-05-095-8/+48
|/
* Fix Item deletion in Inventory againpiernov2016-05-081-3/+2
* Items feature support on save/load gamefeat/savegamepiernov2016-05-081-1/+8
* 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
* Add multiple item support to savegame + fix missing includespiernov2016-05-083-3/+9
* Merge branch 'alexichi' into feat/guipiernov2016-05-076-7/+66
|\
| * Merge branch 'feat/savegame' into alexichipiernov2016-05-072-5/+29
| |\
| * | add the use of the life bottlealexichi2016-05-073-1/+24
| * | add the display of the perso characteristics below the titlealexichi2016-05-071-3/+9
| * | add xp system and perso server sidealexichi2016-05-054-3/+25
| * | add dungeon server side and improve some details like the difference between ...alexichi2016-05-052-6/+13
* | | Merge branch 'feat/savegame' into piernovpiernov2016-05-042-5/+29
|\ \ \ | | |/ | |/|
| * | Receive uploaded savegame from PHPpiernov2016-05-042-0/+23
| * | Now possible to add format to sendMessage() stringspiernov2016-05-041-5/+6
* | | Missing commapiernov2016-05-041-1/+1
| |/ |/|
* | Merge branch 'master' into alexichipiernov2016-05-036-5/+126
|\ \
| * | Merge branch 'feat/savegame' into piernovpiernov2016-05-033-16/+71
| |\|
| | * Better when error/info messages aren't swappedpiernov2016-05-022-3/+3
| | * 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-022-0/+9
| | * 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-013-0/+35
| * | Remove useless mine.mine inpiernov2016-04-271-1/+1
| |/
| * Add savegame.inc with methods for saving the gamepiernov2016-04-271-0/+44
| * Add messages for savegamepiernov2016-04-271-1/+4
| * Add addToXML() methods on Inventory and Item objectspiernov2016-04-272-0/+13
| * Add sendInfo() from PHPfeat/messagespiernov2016-04-271-2/+10
| * Merge remote-tracking branch 'origin/alexichi' into piernovpiernov2016-04-256-22/+36
| |\
| * | Account already debitedfeat/shoppiernov2016-04-251-1/+0
* | | add dungeon client side to display it when reloadalexichi2016-05-032-1/+9
* | | fix shop item countalexichi2016-05-021-4/+4
* | | Add dungeon without fight systemalexichi2016-05-011-0/+11
* | | add the beginning part of the dungeonalexichi2016-05-013-1/+60
* | | add the option to not create 2 objects of the same type, doesn't work wellalexichi2016-04-292-4/+14
* | | add loadShop() and categories in the xml file and modify the presentation of ...alexichi2016-04-271-15/+21
| |/ |/|
* | Mise en commun du shop et de la guildealexichi2016-04-254-15/+19
generated by cgit v1.2.3-70-g09d2 (git 2.47.0) at 2024-11-25 14:11:32 +0000