Merge branch 'release' into develop

HabitRPG · Aug 8, 2018 · 1eb1fe7 · 1eb1fe7
2 parents 6da243e + 72a0e05
commit 1eb1fe7
Show file tree

Hide file tree

Showing 96 changed files with 3,750 additions and 3,629 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "habitica",
   "description": "A habit tracker app which treats your goals like a Role Playing Game.",
-  "version": "4.56.0",
+  "version": "4.56.2",
   "main": "./website/server/index.js",
   "dependencies": {
     "@slack/client": "^3.8.1",

diff --git a/website/client/assets/css/sprites/spritesmith-largeSprites-0.css b/website/client/assets/css/sprites/spritesmith-largeSprites-0.css
@@ -12,7 +12,7 @@
 }
 .promo_mystery_201807 {
   background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -142px -561px;
+  background-position: -314px -561px;
   width: 114px;
   height: 120px;
 }
@@ -24,7 +24,7 @@
 }
 .promo_take_this {
   background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -257px -561px;
+  background-position: -429px -561px;
   width: 96px;
   height: 69px;
 }
@@ -34,6 +34,12 @@
   width: 180px;
   height: 180px;
 }
+.scene_reading {
+  background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
+  background-position: -142px -561px;
+  width: 171px;
+  height: 144px;
+}
 .scene_rewards {
   background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
   background-position: -383px -365px;