mirror of
https://github.com/HabitRPG/habitica.git
synced 2025-12-17 14:47:53 +01:00
Merge branch 'release' into develop
This commit is contained in:
Sabe Jones
2
package-lock.json
generated
2
package-lock.json
generated
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "habitica",
|
||||
"version": "4.121.0",
|
||||
"version": "4.121.1",
|
||||
"lockfileVersion": 1,
|
||||
"requires": true,
|
||||
"dependencies": {
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "habitica",
|
||||
"description": "A habit tracker app which treats your goals like a Role Playing Game.",
|
||||
"version": "4.121.0",
|
||||
"version": "4.121.1",
|
||||
"main": "./website/server/index.js",
|
||||
"dependencies": {
|
||||
"@babel/core": "^7.7.2",
|
||||
|
||||
@@ -1,36 +1,36 @@
|
||||
.promo_armoire_backgrounds_201911 {
|
||||
background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
|
||||
background-position: 0px -451px;
|
||||
background-position: 0px -752px;
|
||||
width: 423px;
|
||||
height: 147px;
|
||||
}
|
||||
.promo_costume_achievement {
|
||||
background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
|
||||
background-position: 0px -747px;
|
||||
background-position: -928px -296px;
|
||||
width: 144px;
|
||||
height: 156px;
|
||||
}
|
||||
.promo_delightful_dinos {
|
||||
background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
|
||||
background-position: -424px -451px;
|
||||
background-position: -424px -752px;
|
||||
width: 423px;
|
||||
height: 147px;
|
||||
}
|
||||
.promo_ember_thunderstorm_potions {
|
||||
background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
|
||||
background-position: 0px -599px;
|
||||
background-position: -928px 0px;
|
||||
width: 423px;
|
||||
height: 147px;
|
||||
}
|
||||
.promo_mystery_201910 {
|
||||
background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
|
||||
background-position: -424px -599px;
|
||||
background-position: -928px -148px;
|
||||
width: 282px;
|
||||
height: 147px;
|
||||
}
|
||||
.promo_take_this {
|
||||
background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
|
||||
background-position: -451px -365px;
|
||||
background-position: -1211px -148px;
|
||||
width: 96px;
|
||||
height: 69px;
|
||||
}
|
||||
@@ -40,9 +40,21 @@
|
||||
width: 450px;
|
||||
height: 450px;
|
||||
}
|
||||
.scene_office {
|
||||
background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
|
||||
background-position: -421px -451px;
|
||||
width: 360px;
|
||||
height: 240px;
|
||||
}
|
||||
.scene_seaserpent {
|
||||
background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
|
||||
background-position: -451px 0px;
|
||||
width: 476px;
|
||||
height: 364px;
|
||||
}
|
||||
.scene_yarn_boss {
|
||||
background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
|
||||
background-position: 0px -451px;
|
||||
width: 420px;
|
||||
height: 300px;
|
||||
}
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 72 KiB After Width: | Height: | Size: 93 KiB |
BIN
website/raw_sprites/spritesmith_large/scene_office.png
Normal file
BIN
website/raw_sprites/spritesmith_large/scene_office.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 13 KiB |
BIN
website/raw_sprites/spritesmith_large/scene_yarn_boss.png
Normal file
BIN
website/raw_sprites/spritesmith_large/scene_yarn_boss.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 22 KiB |
@@ -4,7 +4,7 @@ const api = {};
|
||||
|
||||
// @TODO export this const, cannot export it from here because only routes are exported from
|
||||
// controllers
|
||||
const LAST_ANNOUNCEMENT_TITLE = 'NEW DINOSAUR PET QUEST BUNDLE AND WIKI SPOTLIGHT';
|
||||
const LAST_ANNOUNCEMENT_TITLE = 'HABITICA BLOG POSTS: NEW GUILDS AND GAMIFYING TASKS';
|
||||
const worldDmg = { // @TODO
|
||||
bailey: false,
|
||||
};
|
||||
@@ -31,38 +31,39 @@ api.getNews = {
|
||||
<div class="mr-3 ${baileyClass}"></div>
|
||||
<div class="media-body">
|
||||
<h1 class="align-self-center">${res.t('newStuff')}</h1>
|
||||
<h2>11/14/2019 - ${LAST_ANNOUNCEMENT_TITLE}</h2>
|
||||
<h2>11/19/2019 - ${LAST_ANNOUNCEMENT_TITLE}</h2>
|
||||
</div>
|
||||
</div>
|
||||
<hr/>
|
||||
<div class="promo_delightful_dinos center-block"></div>
|
||||
<h3>New Pet Quest Bundle: Delightful Dinos</h3>
|
||||
<div class="scene_yarn_boss center-block"></div>
|
||||
<h3>Guild Spotlight: New and Notable Guilds for November!</h3>
|
||||
<p>
|
||||
If you are looking to add some dinosaur pets to your Habitica stable, life, uh, finds a
|
||||
way! From now until November 30, you can purchase the Delightful Dinos Pet Quest Bundle
|
||||
and receive the Pterodactyl, Triceratops, and T-Rex (The Dinosaur Unearthed) quests, all
|
||||
for only 7 Gems! That's a discount of 5 Gems from the price of purchasing them
|
||||
separately. Check it out in the <a href='/shops/quests'>Quest Shop</a> today!
|
||||
There's a new <a
|
||||
href='https://habitica.wordpress.com/2019/11/19/new-and-notable-guild-spotlight-11/'
|
||||
target='_blank'>Guild Spotlight on the blog</a> that highlights yet another selection
|
||||
of the upcoming Guilds in Habitica dedicated to a variety of topics! Check it out now to
|
||||
find some of Habitica's best new communities.
|
||||
</p>
|
||||
<div class="small">by SabreCat and Beffymaroo</div>
|
||||
<div class="small">Art by Baconsaur, Eevachu, UncommonCriminal, Kiwibot, McCoyly,
|
||||
plumilla, Seraphina, PainterProphet, Stefalupagus, Katy133, Edge, Willow The Witty,
|
||||
Lilith of Alfheim, Procyon, GeraldThePixel, and Archeia
|
||||
</div>
|
||||
<div class="small mb-3">Writing by Lemoness, Daniel the Bard, Lilith of Alfheim, and Ali
|
||||
Stewart
|
||||
</div>
|
||||
<div class="scene_habitica_map center-block"></div>
|
||||
<h3>Blog Post: Places in Habitica</h3>
|
||||
<p>This month's <a href='https://habitica.wordpress.com/2019/11/14/places-in-habitica/'
|
||||
target='_blank'>featured Wiki article</a> is about Places in Habitica! We hope that it
|
||||
will help you as you gamify your tasks. Be sure to check it out, and let us know what
|
||||
you think by reaching out on <a href='https://twitter.com/habitica'
|
||||
target='_blank'>Twitter</a>, <a href='http://blog.habitrpg.com'
|
||||
target='_blank'>Tumblr</a>, and <a href='https://facebook.com/habitica'
|
||||
target='_blank'>Facebook</a>.
|
||||
<div class="small mb-3">by shanaqui</div>
|
||||
<div class="scene_office center-block"></div>
|
||||
<h3>Use Case Spotlight: Gamifying Your Tasks</h3>
|
||||
<p>
|
||||
This month's <a
|
||||
href='https://habitica.wordpress.com/2019/11/19/use-case-spotlight-gamifying-your-tasks/'
|
||||
target='_blank'>Use Case Spotlight</a> is about Gamifying Your Tasks! It features a
|
||||
number of great suggestions submitted by Habiticans in the <a
|
||||
href='/groups/guild/1d3a10bf-60aa-4806-a38b-82d1084a59e6'>Use Case Spotlights Guild</a>.
|
||||
We hope it helps any of you who might be looking for ways to add more fun and adventure
|
||||
to your tasks.
|
||||
</p>
|
||||
<div class="small mb-3">by shanaqui and the Wiki Wizards</div>
|
||||
<p>
|
||||
Plus, we're collecting user submissions for the next spotlight! How do you use
|
||||
Habitica's social spaces to help motivate yourself? We’ll be featuring player-submitted
|
||||
examples in Use Case Spotlights on the Habitica Blog next month, so post your
|
||||
suggestions in the Use Case Spotlight Guild now. We look forward to learning more about
|
||||
how you use Habitica to improve your life and get things done!
|
||||
</p>
|
||||
<div class="small mb-3">by shanaqui</div>
|
||||
</div>
|
||||
`,
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user