krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 06:37:23 +01:00
Code Issues Packages Projects Releases Wiki Activity
24,093 Commits 63 Branches 1,225 Tags
eb2cb9e9218c53e4e9f7c72bf35ba0ae60da7c7c
Commit Graph

736 Commits

Author SHA1 Message Date
Sabe Jones
eb2cb9e921 Refactor FAQ (#14372) 
* refactor(faq): fetch from API on web
Also make question list more maintainable, allowing different questions across platforms

* fix(tests): don't return null when function is expected
Also removes the unnecessary default to web in controller

* fix(tests): add new fields to expectation, add placeholders

* refactor(faq): allow reordering

Co-authored-by: SabreCat <sabe@habitica.com>
 2022-12-15 11:34:07 -06:00
Natalie L
1ce060eac6 chore(content): add December 2022 Backgrounds and Enchanted Armoire Items (#14382) 
* chore(content): css and images

* chore(content): add December 2022 Backgrounds and Enchanted Armoire Items

* fix(typos): dots no dip

* fix(typo): capitalize game terms

* fix(typos): GitHub regex find, why

* fix(typo): last one maybe?

Co-authored-by: SabreCat <sabe@habitica.com>
Co-authored-by: Sabe Jones <sabrecat@gmail.com>
 2022-12-06 13:21:24 -06:00
Natalie L
9bd039b17b chore(content): add December 2022 Mystery Items (#14379) 
* chore(submodule): images

* chore(content): December Mystery Items

* chore(content): sprites

* fix(typo): whitespace

Co-authored-by: Sabe Jones <sabrecat@gmail.com>
 2022-11-28 15:34:18 -06:00
SabreCat
04e2a39a9f fix(test): rearrange for legacy event logic 2022-11-21 20:08:15 -06:00
SabreCat
a8e9c9bc70 chore(event): set up Harvest Feast 2022 2022-11-21 18:54:57 -06:00
SabreCat
5e05190f22 fix(event): start at 8AM not 8PM 2022-11-15 16:05:06 -06:00
SabreCat
81540ef399 fix(events): EST now not EDT 2022-11-14 14:38:58 -06:00
SabreCat
9f52e47011 feat(content): November Quests and Hatching Potions 
by @CuriousMagpie
 2022-11-14 14:13:08 -06:00
SabreCat
6ee06f76e4 chore(i18n): update locale files 
Also includes two fixes: empty Hourglass transaction logging and missing Recovery + Support guild category
 2022-11-08 10:17:40 -06:00
Sabe Jones
5c7d537c61 Armoire and Backgrounds 2022/11 (#14329) 
* chore(content): Add November Backgrounds and Enchanted Armoire Items

* fix(strings): typos and fullstops

* fix(style): de-whitespace

Co-authored-by: CuriousMagpie <eilatan@gmail.com>
 2022-11-08 10:03:25 -06:00
SabreCat
aea0be3245 fix(subs): establish lock to prevent race condition 2022-11-01 20:47:21 -05:00
Natalie L
3bc82a6692 chore(content): add Bone to Pick achievement (#14318) 
* chore(content): add Bone to Pick achievement

* chore(content): update spritesmith-main.css

* chore(content): add more bone picking

* chore(content): more bone picking

* chore(content): bone picking

* chore(content): i gotta bone to pick here

* chore(content): final bone picking

* chore: add migration script

* chore: update habitica-images

Co-authored-by: SabreCat <sabe@habitica.com>
 2022-10-31 14:19:56 -05:00
Natalie L
b5c950ac96 chore(content): add November 2022 Mystery Items (#14317) 
* chore(content): add November Mystery Items

* chore: merge release into 2022-11-mystery-items

* Revert "chore: merge release into 2022-11-mystery-items"

This reverts commit e12b61d73f.

Co-authored-by: SabreCat <sabe@habitica.com>
 2022-10-30 19:52:55 -05:00
SabreCat
18534a21ff Merge branch 'develop' into release 2022-10-11 11:59:02 -05:00
Natalie L
4d1bbdd8d0 chore(content): add October Backgrounds and Enchanted Armoire Items (#14266) 
* chore(content): add October Backgrounds and Enchanted Armoire Items

* fix(typo): fix a couple of descriptions

* chore(subproject): update images

* fix(typo): keepin our caps consistent

* fix(typo): whitespace, caps

Co-authored-by: SabreCat <sabe@habitica.com>
Co-authored-by: Sabe Jones <sabrecat@gmail.com>
 2022-10-11 11:54:24 -05:00
Natalie L
d1928c9181 chore(content): add October Pet Quest Bundle (#14268) 
* chore(content): add October Pet Quest Bundle

* update: change event start date to the correct one
 2022-10-11 11:53:46 -05:00
SabreCat
3974adcb65 chore(event): set Gem sale dates 2022-09-30 14:57:15 -05:00
Natalie L
a08ecbe044 chore(content): add October 2022 Mystery Items (#14254) 2022-09-28 15:04:47 -05:00
Natalie L
f030135c82 chore(content): add 2022 Fall Festival (#14244) 
* chore(submodule): add August 2022 Mystery Items

* update(content): add 2022 Fall Festival content

* update(content): add 2022 Fall Festival content

* update(content): update event dates for release

* fix(lint): remove extra spaces
also correct typo in gear string keys

* feat(content): remaining descriptions

* fix(event): correct spell availability

* fix(test): work around first-match logic

Co-authored-by: Sabe Jones <sabrecat@gmail.com>
Co-authored-by: SabreCat <sabe@habitica.com>
 2022-09-19 16:55:53 -05:00
Natalie L
0f4711c358 chore(content): add 2022-09 Pet Quest bundle (#14218) 
* chore(content): farmFriends quest bundle

* chore(content): 2022-09 Pet Quest Bundle

* fix(date): fix start date
 2022-09-13 09:12:24 -05:00
Natalie L
6df4ce251c chore(content): add September 2022 Backgrounds and Enchanted Armoire Items (#14200) 
* chore(submodule): add August 2022 Mystery Items

* chore(content): add September 2022 Backgrounds and Enchanted Armoire Items

* fix(typo): periods so people don't grumble

* fix(typo): consistent caps

Co-authored-by: Sabe Jones <sabrecat@gmail.com>
 2022-09-06 12:31:55 -05:00
Natalie L
2b21410abd fix(quest shop): correct forest friends end date (#14202) 2022-09-01 14:45:49 -05:00
Natalie L
755f51b674 chore(content): add September 2022 Mystery Items (#14199) 
* chore(submodule): add August 2022 Mystery Items

* chore(content): add September 2022 Mystery Items

* fix(typo): verb form

Co-authored-by: Sabe Jones <sabrecat@gmail.com>
 2022-08-30 14:06:06 -05:00
SabreCat
b82239811c chore(content): add items to featured 2022-08-15 15:28:47 -05:00
Natalie L
f0b5637e9e chore(content): add Porcelain Magic Hatching Potion (#14168) 
* chore(submodule): add August 2022 Mystery Items

* chore: update habitica-images

* chore(content): add Porcelain Magic Hatching Potion

* chore(content): update moonglow potion availability

* fix(events): no gap between events

Co-authored-by: Sabe Jones <sabrecat@gmail.com>
 2022-08-15 15:14:23 -05:00
Natalie L
0528ee1761 fix(dates): update end dates for quest bundle (#14167) 
* chore(submodule): add August 2022 Mystery Items

* chore(content): add Woodland Wizard achievement

* chore(content): add Forest Friends quest bundle

* fix(typo): whitespace

* fix(dates): update end date for quest bundle

Co-authored-by: Sabe Jones <sabrecat@gmail.com>
 2022-08-09 11:50:05 -05:00
Natalie L
f7b727dc95 chore(content): add Woodland Wizard Achievement and Forest Friends Quest Bundle (#14159) 
* chore(submodule): add August 2022 Mystery Items

* chore(content): add Woodland Wizard achievement

* chore(content): add Forest Friends quest bundle

* fix(typo): whitespace

Co-authored-by: Sabe Jones <sabrecat@gmail.com>
 2022-08-04 15:14:27 -05:00
SabreCat
1c3d4a6fd5 Revert "Revert "chore(content): add August 2022 Backgrounds and Enchanted Armoire Items (#14149)"" 
This reverts commit 9a2b49b4bf.
 2022-08-02 10:09:02 -05:00
SabreCat
9a2b49b4bf Revert "chore(content): add August 2022 Backgrounds and Enchanted Armoire Items (#14149)" 
This reverts commit 2748455f16.
 2022-07-29 16:25:14 -05:00
SabreCat
750a02053c feat(content): August 2022 subscriber items 
Code by @CuriousMagpie
 2022-07-29 16:24:32 -05:00
Natalie L
2748455f16 chore(content): add August 2022 Backgrounds and Enchanted Armoire Items (#14149) 
* chore(submodule): add August 2022 Mystery Items

* chore(content): August 2022 Backgrounds and Enchanted Armoire Items

* chore(submodule): August 2022 Backgrounds and Enchanted Armoire images

* fix(typo): space

* fix(whitespace): spaces

Co-authored-by: Sabe Jones <sabrecat@gmail.com>
 2022-07-29 16:21:20 -05:00
SabreCat
9a879d566e fix(content): correct availability range for Seafoam 2022-07-12 10:05:02 -05:00
Natalie L
0d444a9d6a chore(content): prebuild July Enchanted Armoire and Backgrounds (#14108) 2022-07-06 14:30:40 -05:00
Natalie L
0e458683fd chore(content): add splashySkins for Summer Gala event (#14107) 
* chore(content): add splashySkins for Summer Gala event

* fix(content): use date string, not Boolean, for range start

Co-authored-by: SabreCat <sabe@habitica.com>
 2022-07-05 14:33:50 -05:00
Natalie L
dcced2debb chore(content): July 2022 Mystery Items (#14095) 
* merge upstream/release into release

* chore(content): Added July 2022 Mystery Items
 2022-06-29 14:02:46 -05:00
Natalie L
f0c25dab05 2022 Summer Gala Content (#14067) 
* merge upstream/release into origin/release

* Revert "merge upstream/release into origin/release"

This reverts commit 902ed08cc3.

* Summer Splash 2022 Content

* added magic hatching potions

* updated events for testing

* fix whitespace

* various corrections

* fix(gear): mage set, healer set, event start date

* update: habitica-images

* fix(events): include normal/empty season data outside of gala

* fix(string): missing attribute and event verbiage for warrior item

Co-authored-by: SabreCat <sabe@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