sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-07-13 23:42:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'release' into develop

Browse source
This commit is contained in:
Sabe Jones 2020-06-16 13:36:42 -05:00
commit 274a5f310e
6 changed files with 22 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package-lock.json generated
View file

@ -1,6 +1,6 @@
{ {
"name": "habitica", "name": "habitica",
"version": "4.145.0", "version": "4.145.1",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {

2
package.json
View file

@ -1,7 +1,7 @@
{ {
"name": "habitica", "name": "habitica",
"description": "A habit tracker app which treats your goals like a Role Playing Game.", "description": "A habit tracker app which treats your goals like a Role Playing Game.",
"version": "4.145.0", "version": "4.145.1",
"main": "./website/server/index.js", "main": "./website/server/index.js",
"dependencies": { "dependencies": {
"@babel/core": "^7.10.2", "@babel/core": "^7.10.2",

14
website/client/src/assets/css/sprites/spritesmith-largeSprites-0.css
View file

@ -1,24 +1,30 @@
.promo_armoire_backgrounds_202006 { .promo_armoire_backgrounds_202006 {
background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png'); background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
background-position: -259px 0px; background-position: -340px 0px;
width: 423px; width: 423px;
height: 147px; height: 147px;
} }
.promo_mystery_202006 { .promo_mystery_202006 {
background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png'); background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
background-position: 0px -259px; background-position: -340px -148px;
width: 282px; width: 282px;
height: 147px; height: 147px;
} }
.promo_take_this { .promo_take_this {
background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png'); background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
background-position: -259px -148px; background-position: -623px -148px;
width: 96px; width: 96px;
height: 69px; height: 69px;
} }
.scene_hiking { .scene_achievement {
background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png'); background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
background-position: 0px 0px; background-position: 0px 0px;
width: 339px;
height: 210px;
}
.scene_hiking {
background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
background-position: 0px -211px;
width: 258px; width: 258px;
height: 258px; height: 258px;
} }

BIN
website/client/src/assets/images/sprites/spritesmith-largeSprites-0.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 29 KiB

BIN
website/raw_sprites/spritesmith_large/scene_achievement.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 5.6 KiB

18
website/server/controllers/api-v3/news.js
View file

@ -4,7 +4,7 @@ const api = {};
// @TODO export this const, cannot export it from here because only routes are exported from // @TODO export this const, cannot export it from here because only routes are exported from
// controllers // controllers
const LAST_ANNOUNCEMENT_TITLE = 'NEW QUEST FOR FLUORITE HATCHING POTIONS!'; const LAST_ANNOUNCEMENT_TITLE = 'BLOG POST: WIKI SPOTLIGHT ON CARDS';
const worldDmg = { // @TODO const worldDmg = { // @TODO
bailey: false, bailey: false,
}; };
@ -31,18 +31,20 @@ api.getNews = {
<div class="mr-3 ${baileyClass}"></div> <div class="mr-3 ${baileyClass}"></div>
<div class="media-body"> <div class="media-body">
<h1 class="align-self-center">${res.t('newStuff')}</h1> <h1 class="align-self-center">${res.t('newStuff')}</h1>
<h2>6/11/2020 - ${LAST_ANNOUNCEMENT_TITLE}</h2> <h2>6/16/2020 - ${LAST_ANNOUNCEMENT_TITLE}</h2>
</div> </div>
</div> </div>
<hr/> <hr/>
<div class="quest_fluorite center-block"></div> <div class="scene_achievement center-block"></div>
<p> <p>
Need some color to brighten your day? Get the latest Magic Hatching Potion quest, "A This month's <a href='https://habitica.wordpress.com/2020/06/10/cards/' target='_blank'>
Bright Fluorite Fright", and defeat the Fluorite Elemental to earn vibrant Fluorite Magic featured Wiki article</a> is about Cards! We hope that it will help you as you bond with
Hatching Potions by completing your real-life tasks! your partymates. 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>.
</p> </p>
<div class="small"> Art by @nirbhao and @-Tyr- </div> <div class="small mb-3">by shanaqui and the Wiki Wizards</div>
<div class="small mb-3">Writing by @SphinxWithoutASecret</div>
</div> </div>
`, `,
}); });