diff --git a/website/client/assets/css/sprites/spritesmith-largeSprites-0.css b/website/client/assets/css/sprites/spritesmith-largeSprites-0.css index 5068389b63..7a7bc4501f 100644 --- a/website/client/assets/css/sprites/spritesmith-largeSprites-0.css +++ b/website/client/assets/css/sprites/spritesmith-largeSprites-0.css @@ -6,7 +6,7 @@ } .promo_armoire_background_201803 { background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png'); - background-position: -284px -327px; + background-position: -814px 0px; width: 141px; height: 441px; } @@ -18,7 +18,7 @@ } .promo_hugabug_bundle { background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png'); - background-position: -814px 0px; + background-position: -142px -327px; width: 141px; height: 441px; } @@ -30,19 +30,19 @@ } .promo_mystery_201803 { background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png'); - background-position: -814px -729px; + background-position: -956px -622px; width: 114px; height: 90px; } .promo_rainbow_potions { background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png'); - background-position: -142px -327px; + background-position: -284px -327px; width: 141px; height: 441px; } .promo_seasonalshop_spring { background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png'); - background-position: -441px -752px; + background-position: -956px -196px; width: 162px; height: 138px; } @@ -54,7 +54,7 @@ } .promo_take_this { background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png'); - background-position: -814px -820px; + background-position: -1071px -622px; width: 114px; height: 87px; } @@ -66,13 +66,13 @@ } .scene_podcast { background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png'); - background-position: -814px -442px; + background-position: -956px -335px; width: 141px; height: 141px; } .scene_sweeping { background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png'); - background-position: -814px -584px; + background-position: -956px -477px; width: 138px; height: 144px; } @@ -82,3 +82,9 @@ width: 440px; height: 326px; } +.scene_todos { + background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png'); + background-position: -956px 0px; + width: 240px; + height: 195px; +} diff --git a/website/client/assets/images/sprites/spritesmith-largeSprites-0.png b/website/client/assets/images/sprites/spritesmith-largeSprites-0.png index 2ccdf5d615..6bdccc3efd 100644 Binary files a/website/client/assets/images/sprites/spritesmith-largeSprites-0.png and b/website/client/assets/images/sprites/spritesmith-largeSprites-0.png differ diff --git a/website/client/components/avatar.vue b/website/client/components/avatar.vue index ed0d8eeee6..a4acea6cc0 100644 --- a/website/client/components/avatar.vue +++ b/website/client/components/avatar.vue @@ -22,9 +22,9 @@ span.head_0 span(:class="member.preferences.size + '_' + getGearClass('armor')") span(:class="getGearClass('back_collar')") - span(:class="getGearClass('body')") template(v-for="type in ['bangs', 'base', 'mustache', 'beard']") span(:class="'hair_' + type + '_' + member.preferences.hair[type] + '_' + member.preferences.hair.color") + span(:class="getGearClass('body')") span(:class="getGearClass('eyewear')") span(:class="getGearClass('head')") span(:class="getGearClass('headAccessory')") diff --git a/website/raw_sprites/spritesmith_large/scene_todos.png b/website/raw_sprites/spritesmith_large/scene_todos.png new file mode 100644 index 0000000000..b8c52d399d Binary files /dev/null and b/website/raw_sprites/spritesmith_large/scene_todos.png differ diff --git a/website/server/controllers/api-v3/news.js b/website/server/controllers/api-v3/news.js index edb1c3be91..569f62f6fb 100644 --- a/website/server/controllers/api-v3/news.js +++ b/website/server/controllers/api-v3/news.js @@ -3,7 +3,7 @@ import { authWithHeaders } from '../../middlewares/auth'; let api = {}; // @TODO export this const, cannot export it from here because only routes are exported from controllers -const LAST_ANNOUNCEMENT_TITLE = 'LAST CHANCE FOR SUBSCRIBER ITEMS, MAGIC POTIONS AVAILABLE INTO APRIL, AND COMMUNITY GUIDELINES UPDATES'; +const LAST_ANNOUNCEMENT_TITLE = 'HABITICA ON INSTAGRAM, SELF-IMPOSED CHALLENGE BLOG, AND WHAT\'S THE APRIL FOOL UP TO?'; const worldDmg = { // @TODO bailey: false, }; @@ -32,37 +32,22 @@ api.getNews = {

${res.t('newStuff')}

-

3/29/2018 - ${LAST_ANNOUNCEMENT_TITLE}

+

3/30/2018 - ${LAST_ANNOUNCEMENT_TITLE}

+

Habitica is Now on Instagram!

+

Habitica's Instagram is now live! Follow us for updates and exclusive peeks at behind-the-scenes fun!

-
+
-
-
-

Last Chance for Daring Dragonfly Set

-

Reminder: this is the final day to subscribe and receive the Daring Dragonfly Set! Subscribing also lets you buy gems for gold. The longer your subscription, the more gems you get!

-

Thanks so much for your support! You help keep Habitica running.

-
by Beffymaroo
-
-
-
-

Extended Availability for Shimmer and Rainbow Hatching Potions

-

Due to popular demand, we've extended the availability of the Rainbow and Shimmer Magic Hatching Potions until Spring Fling ends on April 30! Be sure to grab them from the Market before then! If they come back, it won't be until next year at the earliest, so don't delay!

-
by Beffymaroo, Teto Forever, tricksy.fox, and SabreCat
+

New Blog Post: Self-Imposed Challenges!

+

This month's featured Wiki article is about Self-Imposed Challenges! We hope that it will help you as you customize Habitica to make it as fun and challenging as you'd like it to be! Be sure to check it out, and let us know what you think by reaching out on Twitter, Tumblr, and Facebook.

+
by Beffymaroo and the Wiki Wizards
-
-
-

Community Guidelines Updates

-

We've made some important updates to the Community Guidelines to make it easier to read, as well as to clarify some policies on subjects such as promotional Challenges, spamming, and more. Be sure to read it before you chat in the Tavern, in Guilds, or in your Party!

-

Thanks for helping us keep Habitica's community happy and safe!

-
by shanaqui and the marvelous moderators
-
-
-
-

Moderator Contact Form

-

Encountering a community issue? There's a new, simple way to get in touch with the moderator team: the moderator contact form! You can access it under the Help menu, under the Helpful Links in the Tavern sidebar, or on the Contact Us page. This is always the best and fastest way to contact a moderator if you need help. We hope that it will be useful!

-
by TheHollidayInn, Lemoness, and Alys

+

The April Fool Stops By the Tavern...

+

It's that time of year again, and all Habitica's denizens have been on the lookout for stirrings from the most mischievous Masterclasser: the April Fool. Puzzlingly (and perhaps alarmingly!) he's been unusually quiet considering his favorite day is nearing. He's announced he's keeping his plans small-scale and that they will hardly be noticed, but upon hearing this from Tavern-goers on a visit to Habit City, Lady Glaciate rolled her eyes.

+

"I'd be interested to know what the Master of Rogues considers a modestly-proportioned prank…" she says irritably.

+

Perhaps you should check back over the weekend to see what's in store…

`, });