Commit Graph

1423 Commits

Author SHA1 Message Date
Sabe Jones 22bbdd6a28 Merge branch 'develop' into release 2024-06-21 10:14:54 -05:00
Phillip Thelen 1a3d6f6520 fix mage gear being shown as twohanded (#15254) 2024-06-21 10:14:25 -05:00
Sabe Jones 858caa4582 fix(cShop): price display for animal pieces 2024-06-21 09:58:33 -05:00
Sabe Jones 78fca804b7 fix(content): repair Rose Gold Potion and Beach Umbrella 2024-06-21 09:12:18 -05:00
Sabe Jones de9ca06607 fix(gear): fill special data for seasonal body accessories 2024-06-21 07:25:49 -05:00
Sabe Jones 756af8aafb fix(gear): fill special data for seasonal eyewear 2024-06-21 07:21:55 -05:00
Phillip Thelen 5d5275ce70 lint fixes 2024-06-19 17:30:29 +02:00
Phillip Thelen e39c63700e remove duplicate keys 2024-06-19 17:30:16 +02:00
Sabe Jones 28491cb01d fix(content): Umbrella is PER not STR 2024-06-17 10:47:22 -05:00
Sabe Jones b49dddeb47 fix(shops): post merge cleanup 2024-06-14 18:12:22 -05:00
Sabe Jones 31e501f65a Merge branch 'release' into schedule-rc 2024-06-14 10:18:16 -05:00
Phillip Thelen 10a27354bb REVERT ._. 2024-06-11 19:00:34 +02:00
Phillip Thelen a00f199d18 Revert "Revert "allow hatching potions to have a release date""
This reverts commit 485584c144.

# Conflicts:
#	website/common/script/content/hatching-potions.js
2024-06-11 18:54:39 +02:00
Phillip Thelen 388c3d38ed Revert "Improve test coverage"
This reverts commit d4ba96796c.
2024-06-11 18:19:29 +02:00
Phillip Thelen 485584c144 Revert "allow hatching potions to have a release date"
This reverts commit ebdac0b388.
2024-06-11 18:19:21 +02:00
Phillip Thelen b83f62bd82 Revert "allow eggs to have a release date"
This reverts commit 6d13a257dd.
2024-06-11 18:19:11 +02:00
Phillip Thelen eb3220c96b fix lint 2024-06-10 14:46:32 +02:00
Phillip Thelen d4ba96796c Improve test coverage 2024-06-10 14:44:21 +02:00
Phillip Thelen ebdac0b388 allow hatching potions to have a release date 2024-06-10 14:24:59 +02:00
Phillip Thelen 6d13a257dd allow eggs to have a release date 2024-06-10 14:11:38 +02:00
Phillip Thelen c2b370f4d3 handle error from invalid input 2024-06-10 11:23:46 +02:00
Phillip Thelen b76585cce3 add additional way to get content switchover time for client 2024-06-07 11:10:48 +02:00
Phillip Thelen 31036ad9e4 return actually correct quests 2024-06-06 21:51:07 +02:00
Phillip Thelen c26f410cc3 add fallback for seasonal gear 2024-06-06 12:21:34 +02:00
Phillip Thelen ea66e4e4a1 Add end dates to categories in customizationshop 2024-06-05 10:34:17 +02:00
Phillip Thelen 6889b65123 fix questshop featured items 2024-06-05 10:12:47 +02:00
Phillip Thelen 54b1afd5b4 make content releases use a given offset to the time. 2024-05-29 19:05:17 +02:00
Sabe Jones b501e06f27 fix(pets): finish Veteran Cactus 2024-05-29 09:03:36 -05:00
Natalie b2dde8a977 update(content): add 2024-06 content prebuild (#15231)
* update sprites

* add 2024-06 content

* add 2024-06 enchanted armoire items

* update sprites

* update sprites

* fix errors found in testing
2024-05-28 15:23:17 -05:00
Phillip Thelen 88a0b57335 add end date to seasonal gear in market 2024-05-22 15:47:02 +02:00
Phillip Thelen 2303d5de32 Fix quest premium hatching potions in market 2024-05-22 12:21:51 +02:00
Phillip Thelen 42cafbeaab make market return unlocked quest potions 2024-05-21 15:39:59 +02:00
Sabe Jones c5dcd089a6 fix(potions): remove Fungi Potion time banner 2024-05-17 10:49:55 -05:00
Phillip Thelen 57deadaa5c Fix purchasing some hatching potions 2024-05-17 15:44:08 +02:00
Phillip Thelen becdf640b5 fix mystery gear 2024-05-17 12:54:21 +02:00
Phillip Thelen 709a14fd51 add some spell related tests 2024-05-17 11:35:14 +02:00
Phillip Thelen ee974dfa19 fix seasonal quest purchasing 2024-05-17 10:30:15 +02:00
Phillip Thelen b697598d75 fix showing seasonal gear in market 2024-05-17 10:03:59 +02:00
Sabe Jones 6e5b13668a WIP(shops): fixes and Hall of Heroes update 2024-05-16 18:49:56 -05:00
Phillip Thelen 4c13f3193e fix backgrounds not showing on time traveler shop 2024-05-16 20:38:58 +02:00
Phillip Thelen 15cea33c4b fix import 2024-05-16 20:29:03 +02:00
Phillip Thelen c56c07a0f8 fix buying transformation items 2024-05-16 20:19:26 +02:00
Sabe Jones 7e7ce44c77 fix(shops): lots of layout corrections 2024-05-15 17:28:39 -05:00
Phillip Thelen 4d38880249 Refactor armoire content to be cached by day 2024-05-15 16:51:09 +02:00
Phillip Thelen 31e4c51c3f Add June Subscriber Gear 2024-05-15 12:54:53 +02:00
Phillip Thelen eebfb81bd2 add armoire items for june 2024-05-15 12:51:01 +02:00
Phillip Thelen 06623991b3 lint 2024-05-15 12:17:18 +02:00
Phillip Thelen fe697898ee Fix featured items 2024-05-15 12:05:30 +02:00
Phillip Thelen f3fc14bd53 fix seasonal gear 2024-05-15 11:56:40 +02:00
Phillip Thelen 7f0b0a3909 fix seasonal gold price 2024-05-15 11:35:27 +02:00