krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-19 15:48:04 +01:00
Code Issues Packages Projects Releases Wiki Activity
25,701 Commits 64 Branches 1,226 Tags
75c36e6622e91d7f965e0af9dd71cb15b29b7234
Commit Graph

1477 Commits

Author SHA1 Message Date
Phillip Thelen
daa296f2af fix some quests scheduling 2024-04-26 12:05:30 +02:00
Phillip Thelen
4c51212315 Cleanup pinned items that are no longer for purchase 2024-04-26 12:05:27 +02:00
Sabe Jones
372763c57c fix(shops): various 2024-04-24 17:58:20 -05:00
Sabe Jones
7a50b2d2ff Merge branch 'sabrecat/cshop' into subs-private 2024-04-23 10:52:05 -05:00
Sabe Jones
8df326bf92 WIP(shop): add timings to categories 2024-04-23 10:50:45 -05:00
Phillip Thelen
2d6555fe0f fix merge 2024-04-23 17:24:17 +02:00
Phillip Thelen
aedbe7d333 content schedule tweaks 2024-04-23 17:20:21 +02:00
Phillip Thelen
6079dd4af6 feature items according to content schedule 2024-04-23 17:20:21 +02:00
Phillip Thelen
5c448188cf fix potion scheduling 2024-04-23 17:20:21 +02:00
Phillip Thelen
d7dc878b1c Cleanup pinned items that are no longer for purchase 2024-04-23 17:20:20 +02:00
Phillip Thelen
7baec4e48e Fix assigning end date to content schedule items 2024-04-23 14:40:10 +02:00
Sabe Jones
5cd58d4119 WIP(shops): dates and fixes 2024-04-22 17:52:07 -05:00
Sabe Jones
28b936e2d1 WIP(shops): cShop reconciled to schedule backend 2024-04-19 20:11:17 -05:00
Sabe Jones
5f64b2fb25 WIP(customizations): revised backgrounds modal 2024-04-17 18:02:35 -05:00
Sabe Jones
0fd808727c Squashed commit of the following: 
commit 3c3787091a2e8a94857352c3655f60138a3b20b7
Merge: 76a00d6308 76d7f02fe8
Author: Sabe Jones <sabe@habitica.com>
Date:   Mon Apr 8 15:47:35 2024 -0500

    Merge branch 'release' into 2024-04-april-fool-items

commit 76a00d6308997c50ae5f5e9d6170a09a1a8cbac7
Author: Sabe Jones <sabe@habitica.com>
Date:   Thu Mar 28 16:08:39 2024 -0500

    fix(quest): revise rage text

commit c2e13f8af245993f61eb614d6be609c833c2e711
Author: Sabe Jones <sabe@habitica.com>
Date:   Thu Mar 28 12:57:17 2024 -0500

    fix(quest): correct rage and "guscompletion"

commit ecdeb82df998ab75eceae3e877c1758187b1d22c
Author: Sabe Jones <sabe@habitica.com>
Date:   Thu Mar 28 08:55:18 2024 -0500

    fix(events): correct dates and times

commit 232de436bbe7ba4c13f04ed66cc3b8a4a794d884
Author: Sabe Jones <sabe@habitica.com>
Date:   Wed Mar 27 09:03:06 2024 -0500

    fix(content): a few more unruly Fungus

commit 955e6e73387788797d1a83a037f73aa472515cec
Author: Sabe Jones <sabe@habitica.com>
Date:   Wed Mar 27 09:00:03 2024 -0500

    feat(content): wacky potions 2024 by @CuriousMagpie

commit 34b72be4f447f00c31169c4cd6e8ba79655adf8a
Author: Sabe Jones <sabe@habitica.com>
Date:   Wed Mar 27 08:56:27 2024 -0500

    feat(event): AF by @CuriousMagpie
 2024-04-08 15:48:32 -05:00
Sabe Jones
4277c08324 fix(scheduling): lint and code review 2024-04-04 22:42:28 -05:00
Sabe Jones
424f29a82b fix(lint): curly space 2024-04-04 22:02:31 -05:00
Phillip Thelen
e0f4a4ecb8 merge in shop schedule loading 2024-04-03 16:06:08 +02:00
Phillip Thelen
5ce12d97be fix errors 2024-04-03 16:06:08 +02:00
Sabe Jones
4fdd064cd6 Merge branch 'sabrecat/customizations' into subs-private 2024-04-03 08:36:25 -05:00
Sabe Jones
37731b236a WIP(shop): add item names and unlocking 2024-04-02 17:58:06 -05:00
Sabe Jones
b06c708480 Merge branch 'release' into sabrecat/customizations 2024-04-02 15:39:58 -05:00
Sabe Jones
5a9f2c610a Revert "fix(content): adjust release dates" 
This reverts commit 0b230b0a87.
 2024-04-02 15:20:04 -05:00
Sabe Jones
8a88d165e6 fix(event): end AF earlier 2024-04-02 11:28:07 -05:00
Sabe Jones
8b9b79db8e fix(potions): remove EVENT 2024-04-01 19:04:57 -05:00
Sabe Jones
69c0488335 Merge branch 'sabrecat/customizations' into subs-private 2024-04-01 18:57:36 -05:00
Phillip Thelen
c18e06f071 changes 2024-04-01 18:38:04 -05:00
Phillip Thelen
fb56f7df20 Fix various tests 2024-04-01 18:37:46 -05:00
Phillip Thelen
3540a274b3 fix issue with seasonal quest scheduling 2024-04-01 18:36:44 -05:00
Phillip Thelen
fe2c02679e Fix buying some items 2024-04-01 18:36:33 -05:00
Phillip Thelen
bca3e96e9c Implement food seasons 2024-04-01 18:36:24 -05:00
Phillip Thelen
041edb3042 Preen old scheduling code 2024-04-01 18:13:40 -05:00
Phillip Thelen
6e96085f99 add cards to event content cycle 2024-04-01 18:07:41 -05:00
Phillip Thelen
249394b4ad Implement events throughout the year 2024-04-01 18:07:10 -05:00
Phillip Thelen
2a84561e00 fix some date issues with scheduling 2024-04-01 18:06:55 -05:00
Phillip Thelen
f99ddbe60f display customizations in new shop 2024-04-01 17:54:07 -05:00
Phillip Thelen
982069df36 remove logs 2024-04-01 17:52:46 -05:00
Phillip Thelen
db4bec37e3 Implement new schedule system for seasonal shop 2024-04-01 17:52:40 -05:00
Phillip Thelen
736ef16430 simplify schedule matching usage 2024-04-01 17:52:29 -05:00
Phillip Thelen
129cb7627c Implement new content schedule for magic hatching potions 2024-04-01 17:52:21 -05:00
Phillip Thelen
f223b5dd2a Implement schedule for quest bundles 2024-04-01 17:52:12 -05:00
Phillip Thelen
b3521be629 Implement new content schedule for potion and pet quests 2024-04-01 17:52:02 -05:00
Phillip Thelen
17db6a1772 Implement new release schedule for backgrounds 2024-04-01 17:51:47 -05:00
Phillip Thelen
278d9b74f9 Implement new scheduling for time travelers shop 2024-04-01 17:51:38 -05:00
Phillip Thelen
ce796fa1d9 begin building recurring content scheduling 2024-04-01 17:51:24 -05:00
Sabe Jones
0b230b0a87 fix(content): adjust release dates 2024-04-01 15:48:43 -05:00
Sabe Jones
ef1f27c09f Squashed commit of the following: 
commit 0eb12305a58c148027759ea257f0f287796afdda
Author: Sabe Jones <sabe@habitica.com>
Date:   Thu Mar 28 17:13:05 2024 -0500

    feat(event): start April 1 midnight end April 2 8pm

commit de75cf2b9616ad4fe56051d5644c556bd40b874e
Author: Sabe Jones <sabe@habitica.com>
Date:   Thu Mar 28 08:52:01 2024 -0500

    fix(event): correct start timing

commit 34b72be4f447f00c31169c4cd6e8ba79655adf8a
Author: Sabe Jones <sabe@habitica.com>
Date:   Wed Mar 27 08:56:27 2024 -0500

    feat(event): AF by @CuriousMagpie
 2024-03-28 17:17:17 -05:00
Sabe Jones
c762146ec9 fix(quests): egg availability, again 2024-03-26 13:09:41 -05:00
Sabe Jones
39fc6248d6 fix(event): adjust Egg quest release date 2024-03-26 06:48:45 -05:00
Natalie
64f5c170d0 update(content): 2024-04 content prebuild (#15176) 
* update(content): starting april prebuild

* update(content): april prebuild

* update(content): april prebuild
 2024-03-21 15:25:33 -05:00