aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
* 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
* Add data/save directorypiernov2016-04-271-0/+1
* Add savegame.inc with methods for saving the gamepiernov2016-04-271-0/+44
* Savegame PHP action handlingpiernov2016-04-271-0/+3
* Add messages for savegamepiernov2016-04-271-1/+4
* Add addToXML() methods on Inventory and Item objectspiernov2016-04-272-0/+13
* Merge branch 'feat/messages' into feat/savegamepiernov2016-04-271-2/+10
|\
| * Add sendInfo() from PHPfeat/messagespiernov2016-04-271-2/+10
* | Add button for saving on server/downloading the gamepiernov2016-04-272-0/+10
* | Also handle GET request for op in craftmine.phppiernov2016-04-271-3/+7
|/
* Merge remote-tracking branch 'origin/alexichi' into piernovpiernov2016-04-2513-77/+66
|\
| * change class of Hire a Miner, and change type submit to button for itemsalexichi2016-04-252-2/+2
| * Mise en commun du shop et de la guildealexichi2016-04-256-34/+30
| * Merge remote-tracking branch 'origin/piernov' into alexichialexichi2016-04-2522-1636/+417
| |\
| * | remove useless files and add .gitignore to not see them againalexichi2016-04-253-71/+1
| * | Add the guildalexichi2016-04-253-20/+49
| * | Merge branch 'master' of piernov.org:candybox into alexichialexichi2016-04-252-15/+19
| |\ \
| * | | nothing specialalexichi2016-04-241-2/+2
| * | | nothing specialalexichi2016-04-241-2/+2
| * | | add file for the guild ,client side (not finish)alexichi2016-04-231-0/+18
| * | | add file for server sidealexichi2016-04-231-0/+29
| * | | add 2 buttons for createGuild and hireMineralexichi2016-04-231-2/+7
| * | | add require_once and some cases of the switchalexichi2016-04-231-0/+3
* | | | Add Symbola font for items iconspiernov2016-04-252-0/+6
* | | | Merge branch 'feat/shop' into piernovpiernov2016-04-251-1/+0
|\ \ \ \ | |_|_|/ |/| | |
| * | | Account already debitedfeat/shoppiernov2016-04-251-1/+0
* | | | Merge branch 'feat/shop' into piernovpiernov2016-04-241-0/+1
|\| | |
| * | | Include PHP inc/craftmine.phppiernov2016-04-241-0/+1
* | | | Merge branch 'doc' into piernovpiernov2016-04-248-1601/+46
|\ \ \ \
| * | | | Update Proposition initialepiernov2016-04-248-1601/+46
| | |_|/ | |/| |
* | | | Merge branch 'feat/shop' into piernovpiernov2016-04-2413-15/+370
|\ \ \ \ | | |/ / | |/| |
| * | | Add css/craftmine.csspiernov2016-04-241-0/+9
| * | | Rewrote index.xhtml: GUI reworkpiernov2016-04-241-6/+72
| * | | Display error received from server + switch to specified tab on loadpiernov2016-04-241-0/+2
| * | | Add JS GUI helperspiernov2016-04-241-0/+42