Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'alexichi' into piernov | piernov | 2016-05-10 | 1 | -3/+11 |
|\ | |||||
| * | Various fixes | piernov | 2016-05-10 | 1 | -3/+11 |
| | | |||||
* | | Add @package and various fixes | piernov | 2016-05-08 | 1 | -0/+1 |
| | | |||||
* | | First PHPDoc push, Inventory not complete | piernov | 2016-05-08 | 1 | -0/+21 |
|/ | |||||
* | Remove useless mine.mine in | piernov | 2016-04-27 | 1 | -1/+1 |
| | |||||
* | Merge remote-tracking branch 'origin/piernov' into alexichi | alexichi | 2016-04-25 | 1 | -2/+2 |
|\ | | | | | | | | | | | Conflicts: craftmine.php index.xhtml | ||||
| * | Send gold, shop and inventory infos from PHP all at once when requested on ↵ | piernov | 2016-04-24 | 1 | -1/+1 |
| | | | | | | | | loading by client | ||||
| * | json_encode() PHP gold amount sent to client | piernov | 2016-04-24 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' of piernov.org:candybox into alexichi | alexichi | 2016-04-25 | 1 | -3/+4 |
|\| | | | | | | | | | Conflicts: js/craftmine.js | ||||
| * | Fix Mine setup/update | piernov | 2016-04-23 | 1 | -4/+5 |
| | | |||||
* | | nothing special | alexichi | 2016-04-24 | 1 | -2/+2 |
|/ | |||||
* | Mise à jour des mots en anglais | alexichi | 2016-04-21 | 1 | -0/+20 |
suppression de la méthode update mine |