Commit Graph

495 Commits

Author SHA1 Message Date
Matteo Pagliazzi
e53bd5079a adapt chat routes to groups saved on user model 2015-12-18 16:29:57 +01:00
Matteo Pagliazzi
ddf77e0e35 add cliff for completed todos and PMs 2015-12-18 16:00:49 +01:00
Matteo Pagliazzi
2e5c7df94f Merge pull request #6343 from HabitRPG/api-v3-tasks2
[API v3] Tasks 2
2015-12-16 13:18:05 +01:00
Matteo Pagliazzi
155719996d remove user.tasks getter on the server 2015-12-14 20:10:18 +01:00
Matteo Pagliazzi
409102ae19 wip score tests 2015-12-13 23:51:06 +01:00
Blade Barringer
65bb655a10 Merge branch 'develop' into api-v3 2015-12-13 16:39:59 -06:00
Matteo Pagliazzi
a34f41f0f7 misc fixes, GET user (with tests), more comments for preenHistory 2015-12-13 20:08:14 +01:00
Blade Barringer
dafe014ec8 Merge branch 'develop' into TheHollidayInn-skills-burst-backstap-leveling-fix 2015-12-13 10:06:27 -06:00
Matteo Pagliazzi
501a808893 move cron logic back to common 2015-12-11 11:21:36 +01:00
Matteo Pagliazzi
9ffa0d5893 port cron and preening 2015-12-10 19:07:09 +01:00
Matteo Pagliazzi
0f3b307f40 port tests for score and randomDrop 2015-12-09 10:21:15 +01:00
Matteo Pagliazzi
72b2791bc4 refactor scoreTask 2015-12-08 14:41:42 +01:00
Matteo Pagliazzi
582aeafb4b Merge branch 'develop' into api-v3 2015-12-06 17:17:20 +01:00
Sabe Jones
0f578b79ff feat(pets): Peppermint Hatching Potions
Also fixes an issue where the pet hatching modal would appear when the user attempted to hatch a premium version of a quest pet.
2015-12-04 17:20:33 -05:00
Sabe Jones
aa00eae0d5 Merge pull request #6324 from ojeytonwilliams/unequip-notification-fix
Unequip notification fix
2015-12-03 14:01:45 -06:00
Oliver Eyton-Williams
dcd7cae312 Reverted changes related to multiple messages and changed handleTwoHanded to send single, clearer, messages. 2015-12-02 16:51:01 +01:00
Sabe Jones
5b943b4ab9 feat(event): Enable GaymerX armor 2015-12-01 18:11:04 -05:00
Sabe Jones
03222bf084 feat(content): Armoire and backgrounds 2015/12 2015-12-01 16:29:22 -05:00
Oliver Eyton-Williams
da35eb6067 user.ops functions can now send multiple messages at once. Clearer messages are sent when equipping/unequipping two-handed weapons. 2015-12-01 18:24:23 +01:00
Keith Holliday
06ee603942 Initialized usr._temp when score function is skipped 2015-11-29 11:11:06 -06:00
Matteo Pagliazzi
5fa514b6fa Merge branch 'develop' into api-v3 2015-11-27 17:05:29 +01:00
Alys
9f53365648 add comment for refactoring to fix reset bug that doesn't unequip gear properly (e.g., https://github.com/HabitRPG/habitrpg/issues/6304) 2015-11-27 06:13:14 +10:00
Sabe Jones
5d02b70be1 Merge pull request #6264 from ojeytonwilliams/two-handed-weapon-fix
Two-handed weapons no longer automatically equip unless desired. fixes #6231
2015-11-26 10:53:50 -06:00
Sabe Jones
29a84e6666 feat(event): Habitica Thanksgiving 2015-11-25 17:06:52 -05:00
Oliver Eyton-Williams
707cd08a8b Merged: updating two-handed tests to use arrow functions. 2015-11-25 12:12:22 +01:00
Alys
69553260d3 revert refactor of preenHistory 2015-11-24 08:24:33 +10:00
Blade Barringer
7d49a8cbf8 Merge branch 'develop' into HabitRPG-sabrecat/modularize-statHelpers 2015-11-23 08:07:58 -06:00
Alys
65c276c477 fix formatting in preenHistory 2015-11-22 21:08:51 +10:00
Alys
1082bb1f81 refactor preenHistory from index.js to cron.js 2015-11-22 15:52:30 +10:00
Alys
83ea085c21 refactor api.shouldDo and associated code; fix new bug in sanitizeOptions() 2015-11-22 11:28:51 +10:00
Alys
728a94d199 improve coding style 2015-11-22 11:05:03 +10:00
Alys
a380c1aa30 refactor api.daysSince to a cron.js function not exposed on api 2015-11-22 10:48:15 +10:00
Alys
2f8b6d68e8 refactor api.startOfDay to a cron.js function not exposed on api 2015-11-22 07:13:44 +10:00
Alys
6183fd9e71 refactor api.startOfWeek to a cron.js function not exposed on api 2015-11-21 22:26:05 +10:00
Alys
e0784a9791 refactor sanitizeOptions from index.js to cron.js 2015-11-21 22:06:02 +10:00
Alys
a73662bab6 refactor api.dayMapping to DAY_MAPPING const, not exposed on api 2015-11-21 20:48:18 +10:00
Sabe Jones
fb17c3ae80 Merge branch 'develop' into sabrecat/modularize-statHelpers 2015-11-20 13:27:25 -05:00
Sabe Jones
72ea9426dd fix(lint): Space infix operator (?) 2015-11-18 15:18:44 -05:00
Sabe Jones
ed443b490a refactor(constant): Screaming camel MAX_LEVEL 2015-11-18 15:14:47 -05:00
Sabe Jones
31b68219d1 refactor(stats): Address PR comments 2015-11-18 15:06:55 -05:00
Blade Barringer
627da76b49 Merge branch 'develop' into api-v3 2015-11-18 09:09:49 -06:00
Blade Barringer
f94394127a Remove unused var 2015-11-18 08:00:14 -06:00
Blade Barringer
9e557c43d3 Fix bug where seasonal items could not be purchased. 2015-11-18 07:58:01 -06:00
Blade Barringer
26b82dff4b Fix bug where armoire items could not be repurchased. 2015-11-18 07:57:45 -06:00
Oliver Eyton-Williams
cae267c0fa Two-handed weapons no longer automatically equip unless desired. 2015-11-18 11:59:31 +01:00
Blade Barringer
08c4ec5557 Merge branch 'develop' into api-v3 2015-11-17 23:15:15 -06:00
Blade Barringer
a11048b604 Split out wondercon gear into separate module 2015-11-17 17:16:38 -06:00
Blade Barringer
f58b3eee64 Move special gear into own subdirectory 2015-11-17 17:06:00 -06:00
Sabe Jones
7d2643063f fix(math-helpers): diminishingReturns parameter logic 2015-11-17 16:00:18 -05:00
Sabe Jones
4bf20959dd refactor(stats): Math helpers ES2015 module 2015-11-17 15:41:26 -05:00