Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
13,152 Commits 64 Branches 1,256 Tags
4d28eea6e2ee8f0590d3fde165900a743f65942e
Commit Graph

672 Commits

Author SHA1 Message Date
Matteo Pagliazzi ff72706cae wip(shared): port buy ops and linked fns 2016-03-19 16:04:27 +01:00
Sabe Jones 8447259016 Merge pull request #6921 from HabitRPG/sabrecat/spring-2016 
Spring Fling 2016
 2016-03-18 16:08:46 -05:00
Sabe Jones 10a8476aaf WIP(event): Spring Fling cont'd 2016-03-17 13:10:05 -04:00
Sabe Jones 4effa79e17 WIP(event): Spring Fling partial 2016-03-17 13:04:12 -04:00
Blade Barringer c7310b97ec Revert "Revert inventory equipment/gear sorting due to inability to de/equip and maybe performance issues." 
This reverts commit 9d50201180.
 2016-03-17 08:09:18 -05:00
Alys 9d50201180 Revert inventory equipment/gear sorting due to inability to de/equip and maybe performance issues. 
This reverts commits 1c811dbc82, 146810a3e9, 9508ed45df, a6fb945120.
 2016-03-17 21:47:29 +10:00
Blade Barringer 146810a3e9 feat: Add set property to content 2016-03-15 19:41:19 -05:00
Matteo Pagliazzi 219ec01ce9 port shared.ops.allocate 2016-03-15 18:41:23 +01:00
Matteo Pagliazzi b2b4340ee3 change response for shared.ops.sleep, save user in POST /user/sleep and add integration tests for it 2016-03-15 17:05:07 +01:00
Matteo Pagliazzi 490c6a9ae1 wip(shared): port sleep op 2016-03-15 16:33:44 +01:00
Matteo Pagliazzi f55df39fb7 Merge branch 'develop' into api-v3 2016-03-13 23:19:04 +01:00
Matteo Pagliazzi 70df1137a0 fix statsComputed getter 2016-03-13 22:39:14 +01:00
Matteo Pagliazzi 8e3284a4e3 wip(shared): adapt to v3 2016-03-13 22:26:32 +01:00
Matteo Pagliazzi b948fc031f fix typo in common code 2016-03-13 21:12:19 +01:00
Matteo Pagliazzi c02082a200 Merge branch 'develop' into api-v3 2016-03-12 16:00:24 +01:00
Matteo Pagliazzi 6fa23ae49f make sure to clone drop so original properties do not change 2016-03-11 19:11:46 +01:00
Matteo Pagliazzi fbdbd8e006 Merge branch 'develop' into api-v3 2016-03-10 18:30:09 +01:00
Matteo Pagliazzi 05676d834e remove git conflict data 2016-03-10 17:13:13 +01:00
Matteo Pagliazzi c39967767c Merge branch 'develop' into split-shared 2016-03-10 17:00:59 +01:00
Sabe Jones d92614844a Merge pull request #6849 from HabitRPG/sabrecat/pets-201603 
Pet quest March 2016
 2016-03-09 15:11:14 -06:00
Sabe Jones cc53e6e9dc Merge pull request #6733 from vIiRuS/mobileStorage 
Store data for next mobile update
 2016-03-09 14:56:15 -06:00
Sabe Jones d153df7805 feat(content): snail pet quest WIP 2016-03-09 15:34:57 -05:00
Blade Barringer 3fa9d17ad4 Merge branch 'develop' into api-v3 2016-03-08 19:25:50 -06:00
Matteo Pagliazzi 986bfd8035 split remaining utilities from shared 2016-03-08 19:35:02 +01:00
Blade Barringer 155cd6c626 fix: Correct how faq module is exported 2016-03-08 11:59:45 -06:00
Matteo Pagliazzi bb6f0f4252 split user.fns 2016-03-08 18:58:39 +01:00
Matteo Pagliazzi 393a26e51a fix typo: reroll -> rebirth 2016-03-08 18:02:23 +01:00
Matteo Pagliazzi a351cb5f4e change references to imported libs 2016-03-08 17:49:18 +01:00
Matteo Pagliazzi 5a2daabada remove all changes from eslint --fix 2016-03-08 17:45:14 +01:00
Matteo Pagliazzi eeebe4c342 wip: split shared ops 2016-03-07 23:02:42 +01:00
Matteo Pagliazzi 8437c21a51 start splitting ops (readCard has tests) 2016-03-07 19:32:49 +01:00
Matteo Pagliazzi 863ca9954e errors working with babel 6, export v3 shared modules in main common module 2016-03-05 18:58:40 +01:00
Blade Barringer b97511db31 fix: Use module.exports instead of export default 2016-03-04 13:29:51 -06:00
Blade Barringer 4cd0428f0a Merge branch 'develop' into api-v3 2016-03-04 12:16:22 -06:00
Blade Barringer 511b003ec5 Merge pull request #6811 from crookedneighbor/upgrade_babel 
chore: upgrade babel to v6
 2016-03-04 08:36:08 -06:00
Blade Barringer 8c6d8163bc refactor: adjust path to cron module in common code 2016-03-03 18:09:07 -06:00
Matteo Pagliazzi d85c64705e Merge branch 'develop' into api-v3 2016-03-03 21:15:16 +01:00
Matteo Pagliazzi 96c582e062 fix tests, move most errors to shared code 2016-03-03 19:16:03 +01:00
Blade Barringer 0406142e0e chore: upgrade babel to v6 2016-03-02 21:36:27 -06:00
Alys c3107ad3fb improve commenting style 2016-03-03 13:35:55 +10:00
Matteo Pagliazzi 80f791c86b add tests, move CustomError to common, fix casting 2016-03-03 00:16:28 +01:00
Alys 56e53cc95f fix Burst of Flames / fireball skill - was doing too much boss damage; add human-friendly names to skills for ease of searching 2016-03-03 08:30:49 +10:00
Matteo Pagliazzi 05b6e25c28 port spells to api-v3 2016-03-02 13:05:17 +01:00
Matteo Pagliazzi 8920b05f9e Merge branch 'develop' of github.com:HabitRPG/habitrpg into api-v3 2016-03-02 12:59:51 +01:00
Matteo Pagliazzi 5b012750bb convert spells to es6 2016-03-02 12:46:06 +01:00
Sabe Jones ea6abbfabc feat(content): Armoire and BGs 2016-03 2016-03-01 15:59:25 -05:00
Blade Barringer c96ddaeebe refactor: Remove unused common script src files 2016-03-01 08:49:25 -06:00
Matteo Pagliazzi 9114d74357 Merge branch 'develop' into api-v3 2016-03-01 09:44:57 +01:00
Matteo Pagliazzi e5224a7b2a add support for user._tmp, disable user.filters since it is not used 2016-02-29 23:20:13 +01:00
Alys 3464914655 Revert "remove common/script/src" 
This reverts commit 7c5572608f.
 2016-03-01 05:30:44 +10:00