Commit Graph

1005 Commits

Author SHA1 Message Date
CuriousMagpie
98b43c681a use spread operator to combine multiple quest objects into one 2022-02-02 16:48:48 -05:00
CuriousMagpie
40f8c049ab concatenate quest constant arrays into a single quests variable 2022-02-02 16:25:28 -05:00
CuriousMagpie
b5a7b58b57 Merge remote-tracking branch 'upstream/develop' into quest-refactors 2022-02-02 16:24:42 -05:00
SabreCat
ca4df96902 Merge branch 'release' into develop 2022-02-01 15:29:35 -06:00
SabreCat
82d0251fed fix(event): extend 24h because i derped 2022-02-01 15:21:53 -06:00
SabreCat
269c420bfa fix(zodiac): tiger cubs lol 2022-02-01 15:20:08 -06:00
SabreCat
83c2e1774b Merge remote-tracking branch 'CuriousMagpie/zodiac-zookeeper' into release 2022-02-01 14:30:02 -06:00
SabreCat
2093932af6 Merge remote-tracking branch 'CuriousMagpie/2022-02-subscriber-items' into release 2022-02-01 14:29:28 -06:00
SabreCat
b383574438 fix(event): it's 2022 now, lol 2022-02-01 14:27:08 -06:00
SabreCat
c8e949a425 Merge branch 'release' into develop 2022-01-31 19:17:26 -06:00
SabreCat
2ae36f64ad fix(birthday): market cake 2022-01-31 19:17:08 -06:00
Phillip Thelen
6e43d4dc79 Add Transaction log for gem and hourglass changes (#13589)
* Log all gem transactions to database

* Also store hourglass transactions

* Fix tests

* Display transaction history in hall of heroes for admins

* add tests to new API call

* hide transaction settings tab for non admins

* fix(lint): remove console

* fix(lint): various automatic corrections

* fix(transactions): use enum expected pluralizations

* fix api unit tests

* fix lint

* fix failing test

* Fix minor inconsistencies

* Log all gem transactions to database

* Also store hourglass transactions

* Fix tests

* Display transaction history in hall of heroes for admins

* add tests to new API call

* hide transaction settings tab for non admins

* fix(lint): remove console

* fix(lint): various automatic corrections

* fix(transactions): use enum expected pluralizations

* fix api unit tests

* fix lint

* Fix minor inconsistencies

Co-authored-by: Sabe Jones <sabrecat@gmail.com>
2022-01-31 15:36:15 -06:00
Natalie L
de70ad65f5 Update Orb of Rebirth to ignore completed todos (#13773)
* added logic to exclude completed tasks from having task.value set to 0

* logic refinement

* fix(rebirth): complete D

Co-authored-by: SabreCat <sabe@habitica.com>
2022-01-31 15:33:11 -06:00
CuriousMagpie
f2f3a1f0eb added Zodiac Zookeeper achievement 2022-01-28 17:14:50 -05:00
CuriousMagpie
e717880f64 added 2022 birthday bash robes & updated migration script 2022-01-28 15:05:04 -05:00
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
CuriousMagpie
0db8c4e2a3 add 2022-02 subscriber items 2022-01-25 17:32:31 -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