krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-14 13:17:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release' into develop

Browse Source
This commit is contained in:
SabreCat
2017-10-31 01:03:07 +00:00
parent 95d4016678 365daba6fc
commit 8532203717
9 changed files with 1314 additions and 1314 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gulp/gulp-sprites.js
View File

@@ -78,7 +78,7 @@ function cssVarMap (sprite) {
};
}
if (sprite.name.indexOf('shirt') !== -1)
sprite.custom.px.offsetY = `-${ sprite.y + 30 }px`; // even more for shirts
sprite.custom.px.offsetY = `-${ sprite.y + 35 }px`; // even more for shirts
if (sprite.name.indexOf('hair_base') !== -1) {
let styleArray = sprite.name.split('_').slice(2, 3);
if (Number(styleArray[0]) > 14)

2
package-lock.json generated
View File

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

2
package.json
View File

@@ -1,7 +1,7 @@
{
"name": "habitica",
"description": "A habit tracker app which treats your goals like a Role Playing Game.",
"version": "4.7.0",
"version": "4.7.1",
"main": "./website/server/index.js",
"dependencies": {
"@slack/client": "^3.8.1",

486
website/client/assets/css/sprites/spritesmith-main-1.css
View File

File diff suppressed because it is too large Load Diff

658
website/client/assets/css/sprites/spritesmith-main-2.css
View File

File diff suppressed because it is too large Load Diff

658
website/client/assets/css/sprites/spritesmith-main-3.css
View File

File diff suppressed because it is too large Load Diff

658
website/client/assets/css/sprites/spritesmith-main-4.css
View File

File diff suppressed because it is too large Load Diff

130
website/client/assets/css/sprites/spritesmith-main-5.css
View File

@@ -6,7 +6,7 @@
}
.customize-option.skin_mergreen {
background-image: url(/static/sprites/spritesmith-main-5.png);
background-position: ;
background-position: -992px -106px;
width: 60px;
height: 60px;
}
@@ -18,7 +18,7 @@
}
.customize-option.skin_merruby {
background-image: url(/static/sprites/spritesmith-main-5.png);
background-position: ;
background-position: -389px -1013px;
width: 60px;
height: 60px;
}
@@ -30,7 +30,7 @@
}
.customize-option.skin_merruby_sleep {
background-image: url(/static/sprites/spritesmith-main-5.png);
background-position: ;
background-position: -1026px -1104px;
width: 60px;
height: 60px;
}
@@ -42,7 +42,7 @@
}
.customize-option.skin_monster {
background-image: url(/static/sprites/spritesmith-main-5.png);
background-position: ;
background-position: -1174px -834px;
width: 60px;
height: 60px;
}
@@ -54,7 +54,7 @@
}
.customize-option.skin_monster_sleep {
background-image: url(/static/sprites/spritesmith-main-5.png);
background-position: ;
background-position: -1174px -561px;
width: 60px;
height: 60px;
}
@@ -66,7 +66,7 @@
}
.customize-option.skin_ogre {
background-image: url(/static/sprites/spritesmith-main-5.png);
background-position: ;
background-position: -1356px -197px;
width: 60px;
height: 60px;
}
@@ -78,7 +78,7 @@
}
.customize-option.skin_ogre_sleep {
background-image: url(/static/sprites/spritesmith-main-5.png);
background-position: ;
background-position: -844px -1104px;
width: 60px;
height: 60px;
}
@@ -90,7 +90,7 @@
}
.customize-option.skin_panda {
background-image: url(/static/sprites/spritesmith-main-5.png);
background-position: ;
background-position: -207px -194px;
width: 60px;
height: 60px;
}
@@ -102,7 +102,7 @@
}
.customize-option.skin_panda_sleep {
background-image: url(/static/sprites/spritesmith-main-5.png);
background-position: ;
background-position: -116px -194px;
width: 60px;
height: 60px;
}
@@ -114,7 +114,7 @@
}
.customize-option.skin_pastelBlue {
background-image: url(/static/sprites/spritesmith-main-5.png);
background-position: ;
background-position: -355px -106px;
width: 60px;
height: 60px;
}
@@ -126,7 +126,7 @@
}
.customize-option.skin_pastelBlue_sleep {
background-image: url(/static/sprites/spritesmith-main-5.png);
background-position: ;
background-position: -355px -15px;
width: 60px;
height: 60px;
}
@@ -138,7 +138,7 @@
}
.customize-option.skin_pastelGreen {
background-image: url(/static/sprites/spritesmith-main-5.png);
background-position: ;
background-position: -116px -285px;
width: 60px;
height: 60px;
}
@@ -150,7 +150,7 @@
}
.customize-option.skin_pastelGreen_sleep {
background-image: url(/static/sprites/spritesmith-main-5.png);
background-position: ;
background-position: -25px -285px;
width: 60px;
height: 60px;
}
@@ -162,7 +162,7 @@
}
.customize-option.skin_pastelOrange {
background-image: url(/static/sprites/spritesmith-main-5.png);
background-position: ;
background-position: -298px -285px;
width: 60px;
height: 60px;
}
@@ -174,7 +174,7 @@
}
.customize-option.skin_pastelOrange_sleep {
background-image: url(/static/sprites/spritesmith-main-5.png);
background-position: ;
background-position: -207px -285px;
width: 60px;
height: 60px;
}
@@ -186,7 +186,7 @@
}
.customize-option.skin_pastelPink {
background-image: url(/static/sprites/spritesmith-main-5.png);
background-position: ;
background-position: -446px -106px;
width: 60px;
height: 60px;
}
@@ -198,7 +198,7 @@
}
.customize-option.skin_pastelPink_sleep {
background-image: url(/static/sprites/spritesmith-main-5.png);
background-position: ;
background-position: -446px -15px;
width: 60px;
height: 60px;
}
@@ -210,7 +210,7 @@
}
.customize-option.skin_pastelPurple {
background-image: url(/static/sprites/spritesmith-main-5.png);
background-position: ;
background-position: -25px -376px;
width: 60px;
height: 60px;
}
@@ -222,7 +222,7 @@
}
.customize-option.skin_pastelPurple_sleep {
background-image: url(/static/sprites/spritesmith-main-5.png);
background-position: ;
background-position: -446px -197px;
width: 60px;
height: 60px;
}
@@ -234,7 +234,7 @@
}
.customize-option.skin_pastelRainbowChevron {
background-image: url(/static/sprites/spritesmith-main-5.png);
background-position: ;
background-position: -207px -376px;
width: 60px;
height: 60px;
}
@@ -246,7 +246,7 @@
}
.customize-option.skin_pastelRainbowChevron_sleep {
background-image: url(/static/sprites/spritesmith-main-5.png);
background-position: ;
background-position: -116px -376px;
width: 60px;
height: 60px;
}
@@ -258,7 +258,7 @@
}
.customize-option.skin_pastelRainbowDiagonal {
background-image: url(/static/sprites/spritesmith-main-5.png);
background-position: ;
background-position: -389px -376px;
width: 60px;
height: 60px;
}
@@ -270,7 +270,7 @@
}
.customize-option.skin_pastelRainbowDiagonal_sleep {
background-image: url(/static/sprites/spritesmith-main-5.png);
background-position: ;
background-position: -298px -376px;
width: 60px;
height: 60px;
}
@@ -282,7 +282,7 @@
}
.customize-option.skin_pastelYellow {
background-image: url(/static/sprites/spritesmith-main-5.png);
background-position: ;
background-position: -537px -106px;
width: 60px;
height: 60px;
}
@@ -294,7 +294,7 @@
}
.customize-option.skin_pastelYellow_sleep {
background-image: url(/static/sprites/spritesmith-main-5.png);
background-position: ;
background-position: -537px -15px;
width: 60px;
height: 60px;
}
@@ -306,7 +306,7 @@
}
.customize-option.skin_pig {
background-image: url(/static/sprites/spritesmith-main-5.png);
background-position: ;
background-position: -537px -288px;
width: 60px;
height: 60px;
}
@@ -318,7 +318,7 @@
}
.customize-option.skin_pig_sleep {
background-image: url(/static/sprites/spritesmith-main-5.png);
background-position: ;
background-position: -537px -197px;
width: 60px;
height: 60px;
}
@@ -330,7 +330,7 @@
}
.customize-option.skin_polar {
background-image: url(/static/sprites/spritesmith-main-5.png);
background-position: ;
background-position: -116px -467px;
width: 60px;
height: 60px;
}
@@ -342,7 +342,7 @@
}
.customize-option.skin_polar_sleep {
background-image: url(/static/sprites/spritesmith-main-5.png);
background-position: ;
background-position: -25px -467px;
width: 60px;
height: 60px;
}
@@ -354,7 +354,7 @@
}
.customize-option.skin_pumpkin {
background-image: url(/static/sprites/spritesmith-main-5.png);
background-position: ;
background-position: -298px -467px;
width: 60px;
height: 60px;
}
@@ -366,7 +366,7 @@
}
.customize-option.skin_pumpkin2 {
background-image: url(/static/sprites/spritesmith-main-5.png);
background-position: ;
background-position: -480px -467px;
width: 60px;
height: 60px;
}
@@ -378,7 +378,7 @@
}
.customize-option.skin_pumpkin2_sleep {
background-image: url(/static/sprites/spritesmith-main-5.png);
background-position: ;
background-position: -389px -467px;
width: 60px;
height: 60px;
}
@@ -390,7 +390,7 @@
}
.customize-option.skin_pumpkin_sleep {
background-image: url(/static/sprites/spritesmith-main-5.png);
background-position: ;
background-position: -207px -467px;
width: 60px;
height: 60px;
}
@@ -402,7 +402,7 @@
}
.customize-option.skin_rainbow {
background-image: url(/static/sprites/spritesmith-main-5.png);
background-position: ;
background-position: -628px -106px;
width: 60px;
height: 60px;
}
@@ -414,7 +414,7 @@
}
.customize-option.skin_rainbow_sleep {
background-image: url(/static/sprites/spritesmith-main-5.png);
background-position: ;
background-position: -628px -15px;
width: 60px;
height: 60px;
}
@@ -426,7 +426,7 @@
}
.customize-option.skin_reptile {
background-image: url(/static/sprites/spritesmith-main-5.png);
background-position: ;
background-position: -628px -288px;
width: 60px;
height: 60px;
}
@@ -438,7 +438,7 @@
}
.customize-option.skin_reptile_sleep {
background-image: url(/static/sprites/spritesmith-main-5.png);
background-position: ;
background-position: -628px -197px;
width: 60px;
height: 60px;
}
@@ -450,7 +450,7 @@
}
.customize-option.skin_shadow {
background-image: url(/static/sprites/spritesmith-main-5.png);
background-position: ;
background-position: -25px -558px;
width: 60px;
height: 60px;
}
@@ -462,7 +462,7 @@
}
.customize-option.skin_shadow2 {
background-image: url(/static/sprites/spritesmith-main-5.png);
background-position: ;
background-position: -207px -558px;
width: 60px;
height: 60px;
}
@@ -474,7 +474,7 @@
}
.customize-option.skin_shadow2_sleep {
background-image: url(/static/sprites/spritesmith-main-5.png);
background-position: ;
background-position: -116px -558px;
width: 60px;
height: 60px;
}
@@ -486,7 +486,7 @@
}
.customize-option.skin_shadow_sleep {
background-image: url(/static/sprites/spritesmith-main-5.png);
background-position: ;
background-position: -628px -379px;
width: 60px;
height: 60px;
}
@@ -498,7 +498,7 @@
}
.customize-option.skin_shark {
background-image: url(/static/sprites/spritesmith-main-5.png);
background-position: ;
background-position: -389px -558px;
width: 60px;
height: 60px;
}
@@ -510,7 +510,7 @@
}
.customize-option.skin_shark_sleep {
background-image: url(/static/sprites/spritesmith-main-5.png);
background-position: ;
background-position: -298px -558px;
width: 60px;
height: 60px;
}
@@ -522,7 +522,7 @@
}
.customize-option.skin_skeleton {
background-image: url(/static/sprites/spritesmith-main-5.png);
background-position: ;
background-position: -571px -558px;
width: 60px;
height: 60px;
}
@@ -534,7 +534,7 @@
}
.customize-option.skin_skeleton2 {
background-image: url(/static/sprites/spritesmith-main-5.png);
background-position: ;
background-position: -719px -106px;
width: 60px;
height: 60px;
}
@@ -546,7 +546,7 @@
}
.customize-option.skin_skeleton2_sleep {
background-image: url(/static/sprites/spritesmith-main-5.png);
background-position: ;
background-position: -719px -15px;
width: 60px;
height: 60px;
}
@@ -558,7 +558,7 @@
}
.customize-option.skin_skeleton_sleep {
background-image: url(/static/sprites/spritesmith-main-5.png);
background-position: ;
background-position: -480px -558px;
width: 60px;
height: 60px;
}
@@ -570,7 +570,7 @@
}
.customize-option.skin_snowy {
background-image: url(/static/sprites/spritesmith-main-5.png);
background-position: ;
background-position: -719px -288px;
width: 60px;
height: 60px;
}
@@ -582,7 +582,7 @@
}
.customize-option.skin_snowy_sleep {
background-image: url(/static/sprites/spritesmith-main-5.png);
background-position: ;
background-position: -719px -197px;
width: 60px;
height: 60px;
}
@@ -594,7 +594,7 @@
}
.customize-option.skin_sugar {
background-image: url(/static/sprites/spritesmith-main-5.png);
background-position: ;
background-position: -719px -470px;
width: 60px;
height: 60px;
}
@@ -606,7 +606,7 @@
}
.customize-option.skin_sugar_sleep {
background-image: url(/static/sprites/spritesmith-main-5.png);
background-position: ;
background-position: -719px -379px;
width: 60px;
height: 60px;
}
@@ -618,7 +618,7 @@
}
.customize-option.skin_tiger {
background-image: url(/static/sprites/spritesmith-main-5.png);
background-position: ;
background-position: -116px -649px;
width: 60px;
height: 60px;
}
@@ -630,7 +630,7 @@
}
.customize-option.skin_tiger_sleep {
background-image: url(/static/sprites/spritesmith-main-5.png);
background-position: ;
background-position: -25px -649px;
width: 60px;
height: 60px;
}
@@ -642,7 +642,7 @@
}
.customize-option.skin_transparent {
background-image: url(/static/sprites/spritesmith-main-5.png);
background-position: ;
background-position: -298px -649px;
width: 60px;
height: 60px;
}
@@ -654,7 +654,7 @@
}
.customize-option.skin_transparent_sleep {
background-image: url(/static/sprites/spritesmith-main-5.png);
background-position: ;
background-position: -207px -649px;
width: 60px;
height: 60px;
}
@@ -666,7 +666,7 @@
}
.customize-option.skin_tropicalwater {
background-image: url(/static/sprites/spritesmith-main-5.png);
background-position: ;
background-position: -480px -649px;
width: 60px;
height: 60px;
}
@@ -678,7 +678,7 @@
}
.customize-option.skin_tropicalwater_sleep {
background-image: url(/static/sprites/spritesmith-main-5.png);
background-position: ;
background-position: -389px -649px;
width: 60px;
height: 60px;
}
@@ -690,7 +690,7 @@
}
.customize-option.skin_winterstar {
background-image: url(/static/sprites/spritesmith-main-5.png);
background-position: ;
background-position: -662px -649px;
width: 60px;
height: 60px;
}
@@ -702,7 +702,7 @@
}
.customize-option.skin_winterstar_sleep {
background-image: url(/static/sprites/spritesmith-main-5.png);
background-position: ;
background-position: -571px -649px;
width: 60px;
height: 60px;
}
@@ -714,7 +714,7 @@
}
.customize-option.skin_wolf {
background-image: url(/static/sprites/spritesmith-main-5.png);
background-position: ;
background-position: -810px -106px;
width: 60px;
height: 60px;
}
@@ -726,7 +726,7 @@
}
.customize-option.skin_wolf_sleep {
background-image: url(/static/sprites/spritesmith-main-5.png);
background-position: ;
background-position: -810px -15px;
width: 60px;
height: 60px;
}
@@ -738,7 +738,7 @@
}
.customize-option.skin_zombie {
background-image: url(/static/sprites/spritesmith-main-5.png);
background-position: ;
background-position: -810px -288px;
width: 60px;
height: 60px;
}
@@ -750,7 +750,7 @@
}
.customize-option.skin_zombie2 {
background-image: url(/static/sprites/spritesmith-main-5.png);
background-position: ;
background-position: -810px -470px;
width: 60px;
height: 60px;
}
@@ -762,7 +762,7 @@
}
.customize-option.skin_zombie2_sleep {
background-image: url(/static/sprites/spritesmith-main-5.png);
background-position: ;
background-position: -810px -379px;
width: 60px;
height: 60px;
}
@@ -774,7 +774,7 @@
}
.customize-option.skin_zombie_sleep {
background-image: url(/static/sprites/spritesmith-main-5.png);
background-position: ;
background-position: -810px -197px;
width: 60px;
height: 60px;
}

32
website/client/assets/css/sprites/spritesmith-main-8.css
View File

@@ -1302,7 +1302,7 @@
}
.customize-option.eyewear_special_blackTopFrame {
background-image: url(/static/sprites/spritesmith-main-8.png);
background-position: ;
background-position: -1150px -288px;
width: 60px;
height: 60px;
}
@@ -1314,7 +1314,7 @@
}
.customize-option.eyewear_special_blueTopFrame {
background-image: url(/static/sprites/spritesmith-main-8.png);
background-position: ;
background-position: -1150px -379px;
width: 60px;
height: 60px;
}
@@ -1326,7 +1326,7 @@
}
.customize-option.eyewear_special_greenTopFrame {
background-image: url(/static/sprites/spritesmith-main-8.png);
background-position: ;
background-position: -1150px -470px;
width: 60px;
height: 60px;
}
@@ -1338,7 +1338,7 @@
}
.customize-option.eyewear_special_pinkTopFrame {
background-image: url(/static/sprites/spritesmith-main-8.png);
background-position: ;
background-position: -1150px -561px;
width: 60px;
height: 60px;
}
@@ -1350,7 +1350,7 @@
}
.customize-option.eyewear_special_redTopFrame {
background-image: url(/static/sprites/spritesmith-main-8.png);
background-position: ;
background-position: -1150px -652px;
width: 60px;
height: 60px;
}
@@ -1362,7 +1362,7 @@
}
.customize-option.eyewear_special_whiteTopFrame {
background-image: url(/static/sprites/spritesmith-main-8.png);
background-position: ;
background-position: -1150px -743px;
width: 60px;
height: 60px;
}
@@ -1374,7 +1374,7 @@
}
.customize-option.eyewear_special_yellowTopFrame {
background-image: url(/static/sprites/spritesmith-main-8.png);
background-position: ;
background-position: -1150px -834px;
width: 60px;
height: 60px;
}
@@ -1434,7 +1434,7 @@
}
.customize-option.head_0 {
background-image: url(/static/sprites/spritesmith-main-8.png);
background-position: ;
background-position: -1150px -925px;
width: 60px;
height: 60px;
}
@@ -1866,7 +1866,7 @@
}
.customize-option.headAccessory_special_bearEars {
background-image: url(/static/sprites/spritesmith-main-8.png);
background-position: ;
background-position: -844px -1170px;
width: 60px;
height: 60px;
}
@@ -1878,7 +1878,7 @@
}
.customize-option.headAccessory_special_cactusEars {
background-image: url(/static/sprites/spritesmith-main-8.png);
background-position: ;
background-position: -935px -1170px;
width: 60px;
height: 60px;
}
@@ -1890,7 +1890,7 @@
}
.customize-option.headAccessory_special_foxEars {
background-image: url(/static/sprites/spritesmith-main-8.png);
background-position: ;
background-position: -1026px -1170px;
width: 60px;
height: 60px;
}
@@ -1902,7 +1902,7 @@
}
.customize-option.headAccessory_special_lionEars {
background-image: url(/static/sprites/spritesmith-main-8.png);
background-position: ;
background-position: -1117px -1170px;
width: 60px;
height: 60px;
}
@@ -1914,7 +1914,7 @@
}
.customize-option.headAccessory_special_pandaEars {
background-image: url(/static/sprites/spritesmith-main-8.png);
background-position: ;
background-position: -1208px -1170px;
width: 60px;
height: 60px;
}
@@ -1926,7 +1926,7 @@
}
.customize-option.headAccessory_special_pigEars {
background-image: url(/static/sprites/spritesmith-main-8.png);
background-position: ;
background-position: -1332px -15px;
width: 60px;
height: 60px;
}
@@ -1938,7 +1938,7 @@
}
.customize-option.headAccessory_special_tigerEars {
background-image: url(/static/sprites/spritesmith-main-8.png);
background-position: ;
background-position: -1332px -106px;
width: 60px;
height: 60px;
}
@@ -1950,7 +1950,7 @@
}
.customize-option.headAccessory_special_wolfEars {
background-image: url(/static/sprites/spritesmith-main-8.png);
background-position: ;
background-position: -1332px -197px;
width: 60px;
height: 60px;
}