3fa940bdfd
Merge remote-tracking branch 'CuriousMagpie/quest-refactors' into develop
2022-04-15 16:35:27 -05:00
723249e60d
Merge branch 'develop' into release
2022-04-14 15:28:47 -05:00
b608f0ad9c
fix(potion): correct year
2022-04-12 16:01:27 -05:00
afa9a65933
Merge branch 'release' into develop
2022-04-12 14:41:03 -05:00
53569ff983
Merge branch 'sabrecat/wacky-fix' into release
2022-04-12 14:38:41 -05:00
d0c736a7a6
fix(gala): correct dates on seeds and customizations
2022-04-12 14:36:59 -05:00
c8ee51b741
move quest constants to their own folder
2022-04-11 17:10:01 -04:00
405721602f
fix(quests): correct events import, prod bug with seasonal availability
2022-04-07 15:51:14 -05:00
19cf89baec
fix(pr): remove unrelated change
2022-04-07 15:29:52 -05:00
8a4e9888dd
Merge branch 'develop' into quest-refactors
2022-04-07 15:27:19 -05:00
8cb8411cc6
Show "Next Hourglass" Month ( #13860 )
...
* Show "Next Hourglass" Month
* fix lint
* lint,
* lint
* lint..
* linting bad
* ui fixes
* remove additional margin
* show next hourglass date to debug further
* WIP tests - maybe broken logic
* flex:1 doesn't work - so stats columns now at 33% width
* fix(cron): lint and short circuit
* refactor logic
* update test dates using timezone
* also check for the timezone date
* fix timezone for tests
* fixing the test dates?
* fixing the test dates?
* change nextHourglass logic + update gem cap label / value
* fix lint
* dont add gemsBought to it
* remove tooltip
Co-authored-by: SabreCat <sabe@habitica.com >
2022-04-06 16:30:13 -05:00
91511746bc
fix(quest): update market criterion
2022-04-06 13:36:43 -05:00
2f16fe11e1
fix(quest): virtualPet => virtualpet
2022-04-06 12:14:31 -05:00
fb017e1f08
fix(pets): various quest and animation corrections
2022-04-05 16:03:46 -05:00
1ca528eb95
Merge branch 'develop' into 2022-04-wacky-potion-quest
2022-04-05 15:08:18 -05:00
3498b9ccdf
Virtual Pet Hatching Potion Quest Content
2022-04-04 17:29:51 -04:00
c3278a3baf
2022-04 Backgrounds & Enchanted Armoire Items ( #13915 )
...
* 2022-04 Backgrounds & Enchanted Armoire Items
* remove spritesmith-main.css
* adding spritesmith-main.css back in
* css fix
2022-04-04 14:53:34 -05:00
ae6918d52e
chore(event): canonical duration
2022-03-31 14:41:59 -05:00
608ae5fc43
feat(event): April Fooly 2022
2022-03-30 15:31:17 -05:00
2b93ea3740
chore(sprites): compile
2022-03-30 09:44:36 -05:00
61956ea720
Merge remote-tracking branch 'CuriousMagpie/2022-04-subscriber-items' into release
2022-03-30 09:17:52 -05:00
265dfbbb98
2022-04 Subscriber Items
2022-03-29 16:08:25 -04:00
93ae36d139
fix(event): add underscore for mobile handling of NPCs
2022-03-29 14:04:37 -05:00
0783ccae24
2022 Spring Fling Potions
2022-03-29 13:54:07 -05:00
ad9c468e77
fix(event): CSS build, small fixes
2022-03-22 10:34:44 -05:00
e141e2407c
Merge remote-tracking branch 'CuriousMagpie/2022-spring-fling-gala' into release
2022-03-22 09:41:59 -05:00
c94195129f
2022 Spring Fling Content
2022-03-18 17:24:05 -04:00
a24651e395
fix(content): bundle ends March not May
2022-03-15 16:08:53 -05:00
c2d48480a0
chore(content): rerelease cuddle bubbles
2022-03-15 15:00:58 -05:00
7cc17d0369
feat(content): Armoire and Backgrounds
2022-03-09 15:50:31 -06:00
1785ac8226
added Birds of a Feather achievement
2022-03-09 15:39:42 -05:00
43be5f0490
Add Rooster and Peacock
2022-03-08 16:52:43 -05:00
fc4145700c
image update!
2022-03-08 13:06:33 -05:00
aa1b9a5e94
added achievement Birds of a Feather
2022-03-08 12:43:38 -05:00
8dbb55f3b7
2022-03 Subscriber Items
2022-02-28 09:37:49 -06:00
70be356968
chore(content): enable Mythical Marvels for end of February
2022-02-17 14:27:17 -06:00
77751223d3
fix(valentines): adjust empty event daterange
2022-02-14 15:20:37 -06:00
d1ef90db29
Fixed end dates to Feb 18
2022-02-14 15:03:38 -06:00
79cda5d1f6
updates for 2022-02 magic hatching potions & valentine's week
2022-02-14 15:03:32 -06:00
77179d1ff1
Merge remote-tracking branch 'upstream/develop' into quest-refactors
2022-02-10 11:49:31 -05:00
fd4d139fc2
Merge remote-tracking branch 'CuriousMagpie/2022-02-backgrounds-armoire' into develop
2022-02-07 10:51:23 -06:00
55443ecc23
revert files to develop
2022-02-03 12:10:16 -05:00
98b43c681a
use spread operator to combine multiple quest objects into one
2022-02-02 16:48:48 -05:00
40f8c049ab
concatenate quest constant arrays into a single quests variable
2022-02-02 16:25:28 -05:00
b5a7b58b57
Merge remote-tracking branch 'upstream/develop' into quest-refactors
2022-02-02 16:24:42 -05:00
ca4df96902
Merge branch 'release' into develop
2022-02-01 15:29:35 -06:00
82d0251fed
fix(event): extend 24h because i derped
2022-02-01 15:21:53 -06:00
269c420bfa
fix(zodiac): tiger cubs lol
2022-02-01 15:20:08 -06:00
83c2e1774b
Merge remote-tracking branch 'CuriousMagpie/zodiac-zookeeper' into release
2022-02-01 14:30:02 -06:00
2093932af6
Merge remote-tracking branch 'CuriousMagpie/2022-02-subscriber-items' into release
2022-02-01 14:29:28 -06:00
SabreCat