Commit Graph

989 Commits

Author SHA1 Message Date
CuriousMagpie 006aad76d2 first pass on refactoring 2022-01-27 16:59:29 -05:00
CuriousMagpie 1a4af6d6bd Merge remote-tracking branch 'upstream/develop' into quest-refactors 2022-01-27 14:57:41 -05:00
abigley d11810677c Fixed issue with mystery sets, pets, and mounts staying pinned in the rewards column after purchasing. Added logic to look up item info and remove from pinned list by path. (#13701) 2022-01-21 15:10:50 -06:00
CuriousMagpie b4f699b7c4 added item.locked to buy functions 2022-01-14 13:54:41 -05:00
CuriousMagpie 874954b16b quest unlock logic updates, starting on actually locking quests in shop 2022-01-13 16:36:43 -05:00
CuriousMagpie 120b2e9ade removed a bunch of commented code 2022-01-12 17:07:49 -05:00
CuriousMagpie 7d00fe1ecb more quest logic attempts 2022-01-11 15:42:48 -05:00
CuriousMagpie 29ab8856ca linter fix 2022-01-10 15:21:17 -05:00
CuriousMagpie 1eb8ee4dc6 added a comment re Masterclasser 2022-01-07 21:44:57 -05:00
CuriousMagpie 3eb9225b8b and more quest logic things to try 2022-01-07 17:36:47 -05:00
CuriousMagpie 73a29f94a6 Merge branch 'quest-unlocks' of https://github.com/CuriousMagpie/habitica into quest-unlocks 2022-01-07 17:34:49 -05:00
CuriousMagpie 7bd190930f more quest logic 2022-01-07 17:33:37 -05:00
CuriousMagpie d0e9339d3b more quest logic 2022-01-07 17:29:27 -05:00
CuriousMagpie d45122ce06 lockQuest logic updates 2022-01-07 16:25:31 -05:00
CuriousMagpie f3f5d6bb70 Merge remote-tracking branch 'upstream/develop' into quest-unlocks 2022-01-07 15:25:08 -05:00
CuriousMagpie 9b849e095c working on quest logic 2022-01-07 15:20:21 -05:00
SabreCat 82ad85e564 feat(content): Armoire and Backgrounds Jan 2022 2022-01-06 16:28:16 -06:00
CuriousMagpie 55ec42678e quest series refactor started 2021-12-31 16:28:04 -05:00
CuriousMagpie adc7a6ee85 organized quests by type and alphabetically within type 2021-12-31 13:43:59 -05:00
SabreCat 5973bca327 feat(event): New Year's Eve 2021 2021-12-30 13:34:04 -06:00
CuriousMagpie ccc1d5b26e code from abandoned PR #13382 2021-12-29 16:33:11 -05:00
SabreCat bcfea31ffb fix(quests): fix erroneous Egg Hunt and Waffle quest appearances 2021-12-29 13:36:12 -06:00
SabreCat 9bf25c49ae feat(content): Subscriber Items January 2022 2021-12-28 14:38:43 -06:00
SabreCat 685ba1286e feat(content): Winter Wonderland 2021-22 2021-12-21 15:32:11 -06:00
SabreCat 391a9bd91b feat(promo): G1G1 2021
Also refactors a number of places on web client to start using event 
list from world state instead of singular currentEvent
2021-12-15 16:20:43 -06:00
SabreCat 0c3b41727c chore(content): add images, compile sprites 2021-12-07 10:44:23 -06:00
CuriousMagpie 529bc97c9a Update: Dec 2021 Background and Armoire Items 2021-12-02 14:49:04 -05:00
SabreCat 8784d6eee1 feat(content): subscriber items December 2021 2021-11-29 15:02:35 -06:00
SabreCat d20271e91f feat(content): Harvest Feast 2021 2021-11-24 11:23:09 -06:00
SabreCat 2704694214 feat(content): Onyx Hatching Potion quest 2021-11-23 15:33:47 -06:00
CuriousMagpie 5fc26e9497 fix: remove Bird Quest Bundle from Featured Quests in Shop 2021-11-19 14:43:48 -05:00
Sabe Jones b448c721d8 fix(shop): don't show current month's mystery set in time travelers (#13492) 2021-11-12 10:48:07 -06:00
SabreCat 52f6affc3a Merge branch 'release' into develop 2021-11-09 14:06:40 -06:00
SabreCat 117dc23a03 feat(content): Ember and Autumn Leaf rerelease 2021-11-09 14:06:11 -06:00
Natalie L 5d87c2af13 fix: I18n string update (#13588)
* i18n string updates (issue #9210)

* change offHand to offHandCapitalized

* added removeTasks to challenge.json

* added hairBangs back to character.json

* added hairBangs back to character.json

* more hairBangs nonsense

* added hairBangs to hair-settings.vue, removed same from character.json

* changed levelUp to levelup in levelUp.vue and achievements.json

* fix duplicate string values

* fixed different strings with same content in different files

* updated test/api/v3 and test/api/v4 with messageTaskNotFound

* Delete POST-tasks_taskId_checklist_itemId_score.test.js

File got copied to a new directory, doesn't need to be here.

* fix: userID token in patrons.vue and heroes.vue

* removed: unused clock of code

* Restored eggsItemType to inventory.json

Co-authored-by: Sabe Jones <sabrecat@gmail.com>
2021-11-04 16:33:08 -05:00
SabreCat 0bc59f1c50 feat(content): Armoire gear and Backgrounds for Nov 2021 2021-11-04 11:52:00 -05:00
Sabe Jones b39b42b3c2 Merge branch 'develop' into release 2021-10-28 13:55:11 -05:00
Sabe Jones 5e71abe64f feat(content): Habitoween 2021
Royal Purple Jack-O-Lantern Mount, Candy, Spooky Gem Sale, Subscriber 
Mystery Items for November
2021-10-28 13:52:46 -05:00
Benja Appel 4f07075159 Frost spell buff won't affect challenge or group dailies (#13582) 2021-10-22 11:35:27 -05:00
Sabe Jones d2ddb743b6 feat(content): Shade pet/mount collection achievements 2021-10-21 10:49:22 -05:00
Sabe Jones f538998aca Merge branch 'release' into develop 2021-10-12 16:09:04 -05:00
Sabe Jones f4bf576c2f feat(content): enable Spooky Sporklies 2021-10-12 16:01:33 -05:00
KoRnoliX d2a0d4194a Fix casting items on parties that exceed it limit by showing Load More Button (#13509)
* Fixed party size and notification when inviting

Fixed party limit to 30 members (previously 31) and pop-up when trying
to invite someone, when party has already reached it's members limit, to properly
show members number.

* Fixed View Party button in header

Fixed View Party button in header to properly show Load More button
when party size exceeds party limit.

* Fixed View Party button to properly open party

Fixed View Party button to properly open party members list on refreshing the main page, this bug was
caused by previous commit.

* Fixed SelectMembersModal to properly show Load More button

Fixed SelectMembersModal (the modal that apperas when casting
cards/specials on party member) to properly show Load More button when party size exceeds party limit

* fix(test): limit now technically 29 plus leader

* fix(test): adjust for tweakage

Co-authored-by: Sabe Jones <sabrecat@gmail.com>
2021-10-07 15:41:22 -05:00
Sabe Jones abc922f3ed feat(content): Armoire and Backgrounds October 2021 2021-10-07 14:39:58 -05:00
Sabe Jones 155f11eabb feat(event): set canonical time range 2021-10-04 19:01:47 -05:00
Sabe Jones d44b32764f fix(promo): use mobile generic key, maintain gear date range 2021-10-04 18:59:04 -05:00
Sabe Jones 51fd50e411 chore(testing): add Gems promo to festival 2021-10-04 18:58:46 -05:00
Sabe Jones 3e4ec0baf8 feat(content): Mystery Items 2021-10 2021-09-29 21:46:03 -05:00
Sabe Jones c1fc549a1c chore(event): enable autumnal avatar customizations 2021-09-28 16:08:52 -05:00
Sabe Jones 07e19ddb83 fix(event): add underscore for iOS shop suffix 2021-09-22 10:10:13 -05:00