Natalie L
f0c25dab05
2022 Summer Gala Content ( #14067 )
...
* merge upstream/release into origin/release
* Revert "merge upstream/release into origin/release"
This reverts commit 902ed08cc3sabe@habitica.com >
2022-06-21 09:29:53 -05:00
SabreCat
285fcbd71f
fix(content): add event field for countdown
2022-06-14 14:34:25 -05:00
CuriousMagpie
36d82a1d39
June 2022 Pet Quest Bundle
2022-06-14 14:33:53 -05:00
Natalie L
2d1bf74858
June 2022 Backgrounds and Enchanted Armoire ( #14049 )
2022-06-06 14:55:38 -05:00
Natalie L
d726b88a86
Content: Beta Groups Testing Achievement ( #14014 )
...
* content: beta Groups testing achievement
* resolving merge conflict
2022-06-03 15:04:27 -05:00
Natalie L
dd5066ab72
2022-06 Subscriber Items ( #14016 )
...
* 2022-06 Subscriber Items
* chore(mystery): compile sprites, tidy up whitespace
Co-authored-by: SabreCat <sabe@habitica.com >
2022-05-30 15:56:50 -05:00
SabreCat
8358da227d
fix(quests): hide offseason quests, again
...
Also tidy up some Reptacular Rumble issues
2022-05-23 15:38:16 -05:00
CuriousMagpie
5fa705c390
code for reptacular rumble achievement
2022-05-23 14:58:17 -05:00
SabreCat
e7f60cb68f
fix(achievements): TigerCub not Tiger, sigh
2022-05-18 14:43:10 -05:00
SabreCat
c0e22377d1
Merge branch 'release' into develop
2022-05-17 09:33:45 -05:00
Natalie L
4e78d72cee
May 2022 Magic Hatching Potions and Quest Bundle ( #13979 )
...
* May 2022 magic hatching potions and quest bundle
* fix(string): typo
* fix(content): add and use event
Co-authored-by: SabreCat <sabe@habitica.com >
2022-05-17 09:32:50 -05:00
SabreCat
1a74d2b3b0
refactor(achievements): crush down to much fewer notification types
...
most work by @CuriousMagpie
2022-05-12 15:25:40 -05:00
Natalie L
d317bd1c41
May 2022 Backgrounds and Enchanted Armoire ( #13966 )
...
* 2022-05 backgrounds and enchanted armoire images
* 2022-05 backgrounds and enchanted
* chore(sprites): compile
also fix a few string typos
Co-authored-by: SabreCat <sabe@habitica.com >
2022-05-09 14:21:25 -05:00
Natalie L
5e12b7b042
Fix: Inconsistent Quest Unlock Behavior ( #13734 )
...
* remove quest refactoring, created new branch for that task
* remove quest refactoring, created new branch for that task
* More trying to figure out how buying a quest actually works
* rolling back changes
* updated shops/quests/index.vue to disable clicking on locked quests
* removed console.log(item)
* misc fixes per review comments
* changes as requested
* incorporated quest refactors updates
* removing a couple lines of code
2022-05-05 16:51:47 -05:00
CuriousMagpie
5faa49d032
2022-05 Subscriber Items
2022-04-28 15:54:09 -04:00
SabreCat
3fa940bdfd
Merge remote-tracking branch 'CuriousMagpie/quest-refactors' into develop
2022-04-15 16:35:27 -05:00
SabreCat
b608f0ad9c
fix(potion): correct year
2022-04-12 16:01:27 -05:00
SabreCat
53569ff983
Merge branch 'sabrecat/wacky-fix' into release
2022-04-12 14:38:41 -05:00
SabreCat
d0c736a7a6
fix(gala): correct dates on seeds and customizations
2022-04-12 14:36:59 -05:00
CuriousMagpie
c8ee51b741
move quest constants to their own folder
2022-04-11 17:10:01 -04:00
SabreCat
405721602f
fix(quests): correct events import, prod bug with seasonal availability
2022-04-07 15:51:14 -05:00
SabreCat
19cf89baec
fix(pr): remove unrelated change
2022-04-07 15:29:52 -05:00
SabreCat
8a4e9888dd
Merge branch 'develop' into quest-refactors
2022-04-07 15:27:19 -05:00
SabreCat
91511746bc
fix(quest): update market criterion
2022-04-06 13:36:43 -05:00
CuriousMagpie
2f16fe11e1
fix(quest): virtualPet => virtualpet
2022-04-06 12:14:31 -05:00
SabreCat
fb017e1f08
fix(pets): various quest and animation corrections
2022-04-05 16:03:46 -05:00
SabreCat
1ca528eb95
Merge branch 'develop' into 2022-04-wacky-potion-quest
2022-04-05 15:08:18 -05:00
CuriousMagpie
3498b9ccdf
Virtual Pet Hatching Potion Quest Content
2022-04-04 17:29:51 -04:00
Natalie L
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
SabreCat
ae6918d52e
chore(event): canonical duration
2022-03-31 14:41:59 -05:00
SabreCat
608ae5fc43
feat(event): April Fooly 2022
2022-03-30 15:31:17 -05:00
SabreCat
2b93ea3740
chore(sprites): compile
2022-03-30 09:44:36 -05:00
SabreCat
61956ea720
Merge remote-tracking branch 'CuriousMagpie/2022-04-subscriber-items' into release
2022-03-30 09:17:52 -05:00
CuriousMagpie
265dfbbb98
2022-04 Subscriber Items
2022-03-29 16:08:25 -04:00
SabreCat
93ae36d139
fix(event): add underscore for mobile handling of NPCs
2022-03-29 14:04:37 -05:00
CuriousMagpie
0783ccae24
2022 Spring Fling Potions
2022-03-29 13:54:07 -05:00
SabreCat
ad9c468e77
fix(event): CSS build, small fixes
2022-03-22 10:34:44 -05:00
SabreCat
e141e2407c
Merge remote-tracking branch 'CuriousMagpie/2022-spring-fling-gala' into release
2022-03-22 09:41:59 -05:00
CuriousMagpie
c94195129f
2022 Spring Fling Content
2022-03-18 17:24:05 -04:00
SabreCat
a24651e395
fix(content): bundle ends March not May
2022-03-15 16:08:53 -05:00
SabreCat
c2d48480a0
chore(content): rerelease cuddle bubbles
2022-03-15 15:00:58 -05:00
SabreCat
7cc17d0369
feat(content): Armoire and Backgrounds
2022-03-09 15:50:31 -06:00
CuriousMagpie
1785ac8226
added Birds of a Feather achievement
2022-03-09 15:39:42 -05:00
CuriousMagpie
43be5f0490
Add Rooster and Peacock
2022-03-08 16:52:43 -05:00
CuriousMagpie
aa1b9a5e94
added achievement Birds of a Feather
2022-03-08 12:43:38 -05:00
CuriousMagpie
8dbb55f3b7
2022-03 Subscriber Items
2022-02-28 09:37:49 -06:00
SabreCat
70be356968
chore(content): enable Mythical Marvels for end of February
2022-02-17 14:27:17 -06:00
SabreCat
77751223d3
fix(valentines): adjust empty event daterange
2022-02-14 15:20:37 -06:00
CuriousMagpie
d1ef90db29
Fixed end dates to Feb 18
2022-02-14 15:03:38 -06:00
CuriousMagpie
79cda5d1f6
updates for 2022-02 magic hatching potions & valentine's week
2022-02-14 15:03:32 -06:00
