krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-19 15:48:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into sabrecat/onboarding-tweaks

Browse Source
This commit is contained in:
Sabe Jones
2015-08-25 16:47:46 -04:00
parent 23259cd456 6564cb52dc
commit 0c0525640c
27 changed files with 6521 additions and 6475 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/dist/sprites/habitrpg-shared.css vendored
View File

File diff suppressed because one or more lines are too long

170
common/dist/sprites/spritesmith0.css vendored
View File

@@ -4074,479 +4074,491 @@
} }
.hair_base_10_frost { .hair_base_10_frost {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -1365px -1434px; background-position: -91px -1889px;
width: 90px; width: 90px;
height: 90px; height: 90px;
} }
.customize-option.hair_base_10_frost { .customize-option.hair_base_10_frost {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -1390px -1449px; background-position: -116px -1904px;
width: 60px; width: 60px;
height: 60px; height: 60px;
} }
.hair_base_10_ghostwhite { .hair_base_10_ghostwhite {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -1132px -455px; background-position: -1365px -1434px;
width: 90px; width: 90px;
height: 90px; height: 90px;
} }
.customize-option.hair_base_10_ghostwhite { .customize-option.hair_base_10_ghostwhite {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -1157px -470px; background-position: -1390px -1449px;
width: 60px; width: 60px;
height: 60px; height: 60px;
} }
.hair_base_10_green { .hair_base_10_green {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -1132px -364px; background-position: -1132px -455px;
width: 90px; width: 90px;
height: 90px; height: 90px;
} }
.customize-option.hair_base_10_green { .customize-option.hair_base_10_green {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -1157px -379px; background-position: -1157px -470px;
width: 60px; width: 60px;
height: 60px; height: 60px;
} }
.hair_base_10_halloween { .hair_base_10_halloween {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -1132px -273px; background-position: -1132px -364px;
width: 90px; width: 90px;
height: 90px; height: 90px;
} }
.customize-option.hair_base_10_halloween { .customize-option.hair_base_10_halloween {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -1157px -288px; background-position: -1157px -379px;
width: 60px; width: 60px;
height: 60px; height: 60px;
} }
.hair_base_10_holly { .hair_base_10_holly {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -1132px -182px; background-position: -1132px -273px;
width: 90px; width: 90px;
height: 90px; height: 90px;
} }
.customize-option.hair_base_10_holly { .customize-option.hair_base_10_holly {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -1157px -197px; background-position: -1157px -288px;
width: 60px; width: 60px;
height: 60px; height: 60px;
} }
.hair_base_10_hollygreen { .hair_base_10_hollygreen {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -1132px -91px; background-position: -1132px -182px;
width: 90px; width: 90px;
height: 90px; height: 90px;
} }
.customize-option.hair_base_10_hollygreen { .customize-option.hair_base_10_hollygreen {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -1157px -106px; background-position: -1157px -197px;
width: 60px; width: 60px;
height: 60px; height: 60px;
} }
.hair_base_10_midnight { .hair_base_10_midnight {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -1132px 0px; background-position: -1132px -91px;
width: 90px; width: 90px;
height: 90px; height: 90px;
} }
.customize-option.hair_base_10_midnight { .customize-option.hair_base_10_midnight {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -1157px -15px; background-position: -1157px -106px;
width: 60px; width: 60px;
height: 60px; height: 60px;
} }
.hair_base_10_pblue { .hair_base_10_pblue {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -1001px -979px; background-position: -1132px 0px;
width: 90px; width: 90px;
height: 90px; height: 90px;
} }
.customize-option.hair_base_10_pblue { .customize-option.hair_base_10_pblue {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -1026px -994px; background-position: -1157px -15px;
width: 60px; width: 60px;
height: 60px; height: 60px;
} }
.hair_base_10_pblue2 { .hair_base_10_pblue2 {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -910px -979px; background-position: -1001px -979px;
width: 90px; width: 90px;
height: 90px; height: 90px;
} }
.customize-option.hair_base_10_pblue2 { .customize-option.hair_base_10_pblue2 {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -935px -994px; background-position: -1026px -994px;
width: 60px; width: 60px;
height: 60px; height: 60px;
} }
.hair_base_10_peppermint { .hair_base_10_peppermint {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -819px -979px; background-position: -910px -979px;
width: 90px; width: 90px;
height: 90px; height: 90px;
} }
.customize-option.hair_base_10_peppermint { .customize-option.hair_base_10_peppermint {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -844px -994px; background-position: -935px -994px;
width: 60px; width: 60px;
height: 60px; height: 60px;
} }
.hair_base_10_pgreen { .hair_base_10_pgreen {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -728px -979px; background-position: -819px -979px;
width: 90px; width: 90px;
height: 90px; height: 90px;
} }
.customize-option.hair_base_10_pgreen { .customize-option.hair_base_10_pgreen {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -753px -994px; background-position: -844px -994px;
width: 60px; width: 60px;
height: 60px; height: 60px;
} }
.hair_base_10_pgreen2 { .hair_base_10_pgreen2 {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -637px -979px; background-position: -728px -979px;
width: 90px; width: 90px;
height: 90px; height: 90px;
} }
.customize-option.hair_base_10_pgreen2 { .customize-option.hair_base_10_pgreen2 {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -662px -994px; background-position: -753px -994px;
width: 60px; width: 60px;
height: 60px; height: 60px;
} }
.hair_base_10_porange { .hair_base_10_porange {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -546px -979px; background-position: -637px -979px;
width: 90px; width: 90px;
height: 90px; height: 90px;
} }
.customize-option.hair_base_10_porange { .customize-option.hair_base_10_porange {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -571px -994px; background-position: -662px -994px;
width: 60px; width: 60px;
height: 60px; height: 60px;
} }
.hair_base_10_porange2 { .hair_base_10_porange2 {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -455px -979px; background-position: -546px -979px;
width: 90px; width: 90px;
height: 90px; height: 90px;
} }
.customize-option.hair_base_10_porange2 { .customize-option.hair_base_10_porange2 {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -480px -994px; background-position: -571px -994px;
width: 60px; width: 60px;
height: 60px; height: 60px;
} }
.hair_base_10_ppink { .hair_base_10_ppink {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -364px -979px; background-position: -455px -979px;
width: 90px; width: 90px;
height: 90px; height: 90px;
} }
.customize-option.hair_base_10_ppink { .customize-option.hair_base_10_ppink {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -389px -994px; background-position: -480px -994px;
width: 60px; width: 60px;
height: 60px; height: 60px;
} }
.hair_base_10_ppink2 { .hair_base_10_ppink2 {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -273px -979px; background-position: -364px -979px;
width: 90px; width: 90px;
height: 90px; height: 90px;
} }
.customize-option.hair_base_10_ppink2 { .customize-option.hair_base_10_ppink2 {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -298px -994px; background-position: -389px -994px;
width: 60px; width: 60px;
height: 60px; height: 60px;
} }
.hair_base_10_ppurple { .hair_base_10_ppurple {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -182px -979px; background-position: -273px -979px;
width: 90px; width: 90px;
height: 90px; height: 90px;
} }
.customize-option.hair_base_10_ppurple { .customize-option.hair_base_10_ppurple {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -207px -994px; background-position: -298px -994px;
width: 60px; width: 60px;
height: 60px; height: 60px;
} }
.hair_base_10_ppurple2 { .hair_base_10_ppurple2 {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -91px -979px; background-position: -182px -979px;
width: 90px; width: 90px;
height: 90px; height: 90px;
} }
.customize-option.hair_base_10_ppurple2 { .customize-option.hair_base_10_ppurple2 {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -116px -994px; background-position: -207px -994px;
width: 60px; width: 60px;
height: 60px; height: 60px;
} }
.hair_base_10_pumpkin { .hair_base_10_pumpkin {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: 0px -979px; background-position: -91px -979px;
width: 90px; width: 90px;
height: 90px; height: 90px;
} }
.customize-option.hair_base_10_pumpkin { .customize-option.hair_base_10_pumpkin {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -25px -994px; background-position: -116px -994px;
width: 60px; width: 60px;
height: 60px; height: 60px;
} }
.hair_base_10_purple { .hair_base_10_purple {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -1001px -888px; background-position: 0px -979px;
width: 90px; width: 90px;
height: 90px; height: 90px;
} }
.customize-option.hair_base_10_purple { .customize-option.hair_base_10_purple {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -1026px -903px; background-position: -25px -994px;
width: 60px; width: 60px;
height: 60px; height: 60px;
} }
.hair_base_10_pyellow { .hair_base_10_pyellow {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -910px -888px; background-position: -1001px -888px;
width: 90px; width: 90px;
height: 90px; height: 90px;
} }
.customize-option.hair_base_10_pyellow { .customize-option.hair_base_10_pyellow {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -935px -903px; background-position: -1026px -903px;
width: 60px; width: 60px;
height: 60px; height: 60px;
} }
.hair_base_10_pyellow2 { .hair_base_10_pyellow2 {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -819px -888px; background-position: -910px -888px;
width: 90px; width: 90px;
height: 90px; height: 90px;
} }
.customize-option.hair_base_10_pyellow2 { .customize-option.hair_base_10_pyellow2 {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -844px -903px; background-position: -935px -903px;
width: 60px; width: 60px;
height: 60px; height: 60px;
} }
.hair_base_10_rainbow { .hair_base_10_rainbow {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -728px -888px; background-position: -819px -888px;
width: 90px; width: 90px;
height: 90px; height: 90px;
} }
.customize-option.hair_base_10_rainbow { .customize-option.hair_base_10_rainbow {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -753px -903px; background-position: -844px -903px;
width: 60px; width: 60px;
height: 60px; height: 60px;
} }
.hair_base_10_red { .hair_base_10_red {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -637px -888px; background-position: -728px -888px;
width: 90px; width: 90px;
height: 90px; height: 90px;
} }
.customize-option.hair_base_10_red { .customize-option.hair_base_10_red {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -662px -903px; background-position: -753px -903px;
width: 60px; width: 60px;
height: 60px; height: 60px;
} }
.hair_base_10_snowy { .hair_base_10_snowy {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -546px -888px; background-position: -637px -888px;
width: 90px; width: 90px;
height: 90px; height: 90px;
} }
.customize-option.hair_base_10_snowy { .customize-option.hair_base_10_snowy {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -571px -903px; background-position: -662px -903px;
width: 60px; width: 60px;
height: 60px; height: 60px;
} }
.hair_base_10_white { .hair_base_10_white {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -455px -888px; background-position: -546px -888px;
width: 90px; width: 90px;
height: 90px; height: 90px;
} }
.customize-option.hair_base_10_white { .customize-option.hair_base_10_white {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -480px -903px; background-position: -571px -903px;
width: 60px; width: 60px;
height: 60px; height: 60px;
} }
.hair_base_10_winternight { .hair_base_10_winternight {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -364px -888px; background-position: -455px -888px;
width: 90px; width: 90px;
height: 90px; height: 90px;
} }
.customize-option.hair_base_10_winternight { .customize-option.hair_base_10_winternight {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -389px -903px; background-position: -480px -903px;
width: 60px; width: 60px;
height: 60px; height: 60px;
} }
.hair_base_10_winterstar { .hair_base_10_winterstar {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -273px -888px; background-position: -364px -888px;
width: 90px; width: 90px;
height: 90px; height: 90px;
} }
.customize-option.hair_base_10_winterstar { .customize-option.hair_base_10_winterstar {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -298px -903px; background-position: -389px -903px;
width: 60px; width: 60px;
height: 60px; height: 60px;
} }
.hair_base_10_yellow { .hair_base_10_yellow {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -182px -888px; background-position: -273px -888px;
width: 90px; width: 90px;
height: 90px; height: 90px;
} }
.customize-option.hair_base_10_yellow { .customize-option.hair_base_10_yellow {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -207px -903px; background-position: -298px -903px;
width: 60px; width: 60px;
height: 60px; height: 60px;
} }
.hair_base_10_zombie { .hair_base_10_zombie {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -91px -888px; background-position: -182px -888px;
width: 90px; width: 90px;
height: 90px; height: 90px;
} }
.customize-option.hair_base_10_zombie { .customize-option.hair_base_10_zombie {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -116px -903px; background-position: -207px -903px;
width: 60px; width: 60px;
height: 60px; height: 60px;
} }
.hair_base_11_TRUred { .hair_base_11_TRUred {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: 0px -888px; background-position: -91px -888px;
width: 90px; width: 90px;
height: 90px; height: 90px;
} }
.customize-option.hair_base_11_TRUred { .customize-option.hair_base_11_TRUred {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -25px -903px; background-position: -116px -903px;
width: 60px; width: 60px;
height: 60px; height: 60px;
} }
.hair_base_11_aurora { .hair_base_11_aurora {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -990px -717px; background-position: 0px -888px;
width: 90px; width: 90px;
height: 90px; height: 90px;
} }
.customize-option.hair_base_11_aurora { .customize-option.hair_base_11_aurora {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -1015px -732px; background-position: -25px -903px;
width: 60px; width: 60px;
height: 60px; height: 60px;
} }
.hair_base_11_black { .hair_base_11_black {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -990px -626px; background-position: -990px -717px;
width: 90px; width: 90px;
height: 90px; height: 90px;
} }
.customize-option.hair_base_11_black { .customize-option.hair_base_11_black {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -1015px -641px; background-position: -1015px -732px;
width: 60px; width: 60px;
height: 60px; height: 60px;
} }
.hair_base_11_blond { .hair_base_11_blond {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -990px -535px; background-position: -990px -626px;
width: 90px; width: 90px;
height: 90px; height: 90px;
} }
.customize-option.hair_base_11_blond { .customize-option.hair_base_11_blond {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -1015px -550px; background-position: -1015px -641px;
width: 60px; width: 60px;
height: 60px; height: 60px;
} }
.hair_base_11_blue { .hair_base_11_blue {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: 0px -1070px; background-position: -990px -535px;
width: 90px; width: 90px;
height: 90px; height: 90px;
} }
.customize-option.hair_base_11_blue { .customize-option.hair_base_11_blue {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -25px -1085px; background-position: -1015px -550px;
width: 60px; width: 60px;
height: 60px; height: 60px;
} }
.hair_base_11_brown { .hair_base_11_brown {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -1132px -910px; background-position: 0px -1070px;
width: 90px; width: 90px;
height: 90px; height: 90px;
} }
.customize-option.hair_base_11_brown { .customize-option.hair_base_11_brown {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -1157px -925px; background-position: -25px -1085px;
width: 60px; width: 60px;
height: 60px; height: 60px;
} }
.hair_base_11_candycane { .hair_base_11_candycane {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -1132px -819px; background-position: -1132px -910px;
width: 90px; width: 90px;
height: 90px; height: 90px;
} }
.customize-option.hair_base_11_candycane { .customize-option.hair_base_11_candycane {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -1157px -834px; background-position: -1157px -925px;
width: 60px; width: 60px;
height: 60px; height: 60px;
} }
.hair_base_11_candycorn { .hair_base_11_candycorn {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -1132px -728px; background-position: -1132px -819px;
width: 90px; width: 90px;
height: 90px; height: 90px;
} }
.customize-option.hair_base_11_candycorn { .customize-option.hair_base_11_candycorn {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -1157px -743px; background-position: -1157px -834px;
width: 60px; width: 60px;
height: 60px; height: 60px;
} }
.hair_base_11_festive { .hair_base_11_festive {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -1132px -637px; background-position: -1132px -728px;
width: 90px; width: 90px;
height: 90px; height: 90px;
} }
.customize-option.hair_base_11_festive { .customize-option.hair_base_11_festive {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -1157px -652px; background-position: -1157px -743px;
width: 60px; width: 60px;
height: 60px; height: 60px;
} }
.hair_base_11_frost { .hair_base_11_frost {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -1132px -546px; background-position: -1132px -637px;
width: 90px; width: 90px;
height: 90px; height: 90px;
} }
.customize-option.hair_base_11_frost { .customize-option.hair_base_11_frost {
background-image: url(spritesmith0.png);
background-position: -1157px -652px;
width: 60px;
height: 60px;
}
.hair_base_11_ghostwhite {
background-image: url(spritesmith0.png);
background-position: -1132px -546px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_11_ghostwhite {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -1157px -561px; background-position: -1157px -561px;
width: 60px; width: 60px;

BIN
common/dist/sprites/spritesmith0.png vendored
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 241 KiB

After

Width:  |  Height:  |  Size: 241 KiB

5920
common/dist/sprites/spritesmith1.css vendored
View File

File diff suppressed because it is too large Load Diff

BIN
common/dist/sprites/spritesmith1.png vendored
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 25 KiB

After

Width:  |  Height:  |  Size: 25 KiB

1332
common/dist/sprites/spritesmith2.css vendored
View File

File diff suppressed because it is too large Load Diff

BIN
common/dist/sprites/spritesmith2.png vendored
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 110 KiB

After

Width:  |  Height:  |  Size: 109 KiB

1702
common/dist/sprites/spritesmith3.css vendored
View File

File diff suppressed because it is too large Load Diff

BIN
common/dist/sprites/spritesmith3.png vendored
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 89 KiB

After

Width:  |  Height:  |  Size: 89 KiB

2104
common/dist/sprites/spritesmith4.css vendored
View File

File diff suppressed because it is too large Load Diff

BIN
common/dist/sprites/spritesmith4.png vendored
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 575 KiB

After

Width:  |  Height:  |  Size: 573 KiB

856
common/dist/sprites/spritesmith5.css vendored
View File

File diff suppressed because it is too large Load Diff

BIN
common/dist/sprites/spritesmith5.png vendored
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 243 KiB

After

Width:  |  Height:  |  Size: 244 KiB

824
common/dist/sprites/spritesmith6.css vendored
View File

File diff suppressed because it is too large Load Diff

BIN
common/dist/sprites/spritesmith6.png vendored
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 204 KiB

After

Width:  |  Height:  |  Size: 204 KiB

BIN
common/img/sprites/spritesmith/gear/events/mystery_201508/broad_armor_mystery_201508.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.3 KiB

BIN
common/img/sprites/spritesmith/gear/events/mystery_201508/head_mystery_201508.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.3 KiB

BIN
common/img/sprites/spritesmith/gear/events/mystery_201508/shop_armor_mystery_201508.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.1 KiB

BIN
common/img/sprites/spritesmith/gear/events/mystery_201508/shop_head_mystery_201508.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.2 KiB

BIN
common/img/sprites/spritesmith/gear/events/mystery_201508/slim_armor_mystery_201508.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.3 KiB

BIN
common/img/sprites/spritesmith/promo/promo_mystery_201508.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.8 KiB

4
common/locales/en/gear.json
View File

@@ -314,6 +314,8 @@
"armorMystery201504Notes": "You'll be productive as a busy bee in this fetching robe! Confers no benefit. April 2015 Subscriber Item.", "armorMystery201504Notes": "You'll be productive as a busy bee in this fetching robe! Confers no benefit. April 2015 Subscriber Item.",
"armorMystery201506Text": "Snorkel Suit", "armorMystery201506Text": "Snorkel Suit",
"armorMystery201506Notes": "Snorkel through a coral reef in this brightly-colored swim suit! Confers no benefit. June 2015 Subscriber Item.", "armorMystery201506Notes": "Snorkel through a coral reef in this brightly-colored swim suit! Confers no benefit. June 2015 Subscriber Item.",
"armorMystery201508Text": "Cheetah Costume",
"armorMystery201508Notes": "Run fast as a flash in the fluffy Cheetah Costume! Confers no benefit. August 2015 Subscriber Item.",
"armorMystery301404Text": "Steampunk Suit", "armorMystery301404Text": "Steampunk Suit",
"armorMystery301404Notes": "Dapper and dashing, wot! Confers no benefit. February 3015 Subscriber Item.", "armorMystery301404Notes": "Dapper and dashing, wot! Confers no benefit. February 3015 Subscriber Item.",
@@ -474,6 +476,8 @@
"headMystery201501Notes": "The constellations flicker and swirl in this helm, guiding the wearer's thoughts towards focus. Confers no benefit. January 2015 Subscriber Item.", "headMystery201501Notes": "The constellations flicker and swirl in this helm, guiding the wearer's thoughts towards focus. Confers no benefit. January 2015 Subscriber Item.",
"headMystery201505Text": "Green Knight Helm", "headMystery201505Text": "Green Knight Helm",
"headMystery201505Notes": "The green plume on this iron helm waves proudly. Confers no benefit. May 2015 Subscriber Item.", "headMystery201505Notes": "The green plume on this iron helm waves proudly. Confers no benefit. May 2015 Subscriber Item.",
"headMystery201508Text": "Cheetah Hat",
"headMystery201508Notes": "This cozy cheetah hat is very fuzzy! Confers no benefit. August 2015 Subscriber Item.",
"headMystery301404Text": "Fancy Top Hat", "headMystery301404Text": "Fancy Top Hat",
"headMystery301404Notes": "A fancy top hat for the finest of gentlefolk! January 3015 Subscriber Item. Confers no benefit.", "headMystery301404Notes": "A fancy top hat for the finest of gentlefolk! January 3015 Subscriber Item. Confers no benefit.",
"headMystery301405Text": "Basic Top Hat", "headMystery301405Text": "Basic Top Hat",

11
common/script/content.coffee
View File

@@ -52,6 +52,7 @@ api.mystery =
201505: {start:'2015-05-25',end:'2015-06-02', text:'Green Knight Set'} 201505: {start:'2015-05-25',end:'2015-06-02', text:'Green Knight Set'}
201506: {start:'2015-06-25',end:'2015-07-02', text:'Neon Snorkeler Set'} 201506: {start:'2015-06-25',end:'2015-07-02', text:'Neon Snorkeler Set'}
201507: {start:'2015-07-24',end:'2015-08-02', text:'Rad Surfer Set'} 201507: {start:'2015-07-24',end:'2015-08-02', text:'Rad Surfer Set'}
201508: {start:'2015-08-23',end:'2015-09-02', text:'Cheetah Costume Set'}
301404: {start:'3014-03-24',end:'3014-04-02', text:'Steampunk Standard Set'} 301404: {start:'3014-03-24',end:'3014-04-02', text:'Steampunk Standard Set'}
301405: {start:'3014-04-24',end:'3014-05-02', text:'Steampunk Accessories Set'} 301405: {start:'3014-04-24',end:'3014-05-02', text:'Steampunk Accessories Set'}
wondercon: {start:'2014-03-24',end:'2014-04-01'} # not really, but the mechanic works wondercon: {start:'2014-03-24',end:'2014-04-01'} # not really, but the mechanic works
@@ -86,14 +87,6 @@ gear =
5: text: t('weaponWarrior5Text'), notes: t('weaponWarrior5Notes', {str: 15}), str: 15, value:90 5: text: t('weaponWarrior5Text'), notes: t('weaponWarrior5Notes', {str: 15}), str: 15, value:90
6: text: t('weaponWarrior6Text'), notes: t('weaponWarrior6Notes', {str: 18}), str: 18, value:120, last: true 6: text: t('weaponWarrior6Text'), notes: t('weaponWarrior6Notes', {str: 18}), str: 18, value:120, last: true
rogue: rogue:
#Not using bows at the moment, but they would be easy to add back in to an advanced Armory feature, as Quest drops, etc.
#0: twoHanded: true, text: "Practice Bow", notes:'Training weapon. Confers no benefit.', value:0
#1: twoHanded: true, text: "Short Bow", notes:'Simple bow best at close ranges. Increases STR by 2.', str: 2, value:20
#2: twoHanded: true, text: "Long Bow", notes:'Bow with a strong draw for extra distance. Increases STR by 5.', str: 5, value:50
#3: twoHanded: true, text: "Recurve Bow", notes:'Built with advanced techniques. Increases STR by 8.', str: 8, value:80
#4: twoHanded: true, text: "Icicle Bow", notes:'Fires arrows of piercing cold. Increases STR by 12.', str: 12, value:120
#5: twoHanded: true, text: "Meteor Bow", notes:'Rains flame upon your foes. Increases STR by 16.', str: 16, value:160
#6: twoHanded: true, text: "Golden Bow", notes:'As swift as sunlight and as sharp as lightning. Increases STR by 20.', str: 20, value:200, last: true
0: text: t('weaponRogue0Text'), notes: t('weaponRogue0Notes'), str: 0, value: 0 0: text: t('weaponRogue0Text'), notes: t('weaponRogue0Notes'), str: 0, value: 0
1: text: t('weaponRogue1Text'), notes: t('weaponRogue1Notes', {str: 2}), str: 2, value: 20 1: text: t('weaponRogue1Text'), notes: t('weaponRogue1Notes', {str: 2}), str: 2, value: 20
2: text: t('weaponRogue2Text'), notes: t('weaponRogue2Notes', {str: 3}), str: 3, value: 35 2: text: t('weaponRogue2Text'), notes: t('weaponRogue2Notes', {str: 3}), str: 3, value: 35
@@ -258,6 +251,7 @@ gear =
201503: text: t('armorMystery201503Text'), notes: t('armorMystery201503Notes'), mystery:'201503', value: 0 201503: text: t('armorMystery201503Text'), notes: t('armorMystery201503Notes'), mystery:'201503', value: 0
201504: text: t('armorMystery201504Text'), notes: t('armorMystery201504Notes'), mystery:'201504', value: 0 201504: text: t('armorMystery201504Text'), notes: t('armorMystery201504Notes'), mystery:'201504', value: 0
201506: text: t('armorMystery201506Text'), notes: t('armorMystery201506Notes'), mystery:'201506', value: 0 201506: text: t('armorMystery201506Text'), notes: t('armorMystery201506Notes'), mystery:'201506', value: 0
201508: text: t('armorMystery201508Text'), notes: t('armorMystery201508Notes'), mystery:'201508', value: 0, int: 0
301404: text: t('armorMystery301404Text'), notes: t('armorMystery301404Notes'), mystery:'301404', value: 0 301404: text: t('armorMystery301404Text'), notes: t('armorMystery301404Notes'), mystery:'301404', value: 0
armoire: armoire:
lunarArmor: text: t('armorArmoireLunarArmorText'), notes: t('armorArmoireLunarArmorNotes', {str: 7, int: 7}), value: 100, str: 7, int: 7, set: 'soothing', canOwn: ((u)-> u.items.gear.owned.armor_armoire_lunarArmor?) lunarArmor: text: t('armorArmoireLunarArmorText'), notes: t('armorArmoireLunarArmorNotes', {str: 7, int: 7}), value: 100, str: 7, int: 7, set: 'soothing', canOwn: ((u)-> u.items.gear.owned.armor_armoire_lunarArmor?)
@@ -348,6 +342,7 @@ gear =
201412: text: t('headMystery201412Text'), notes: t('headMystery201412Notes'), mystery:'201412', value: 0 201412: text: t('headMystery201412Text'), notes: t('headMystery201412Notes'), mystery:'201412', value: 0
201501: text: t('headMystery201501Text'), notes: t('headMystery201501Notes'), mystery:'201501', value: 0 201501: text: t('headMystery201501Text'), notes: t('headMystery201501Notes'), mystery:'201501', value: 0
201505: text: t('headMystery201505Text'), notes: t('headMystery201505Notes'), mystery:'201505', value: 0 201505: text: t('headMystery201505Text'), notes: t('headMystery201505Notes'), mystery:'201505', value: 0
201508: text: t('headMystery201508Text'), notes: t('headMystery201508Notes'), mystery:'201508', value: 0, int: 0
301404: text: t('headMystery301404Text'), notes: t('headMystery301404Notes'), mystery:'301404', value: 0 301404: text: t('headMystery301404Text'), notes: t('headMystery301404Notes'), mystery:'301404', value: 0
301405: text: t('headMystery301405Text'), notes: t('headMystery301405Notes'), mystery:'301405', value: 0 301405: text: t('headMystery301405Text'), notes: t('headMystery301405Notes'), mystery:'301405', value: 0
armoire: armoire:

2
common/script/index.coffee
View File

@@ -1178,7 +1178,7 @@ api.wrap = (user, main=true) ->
item = content.gear.flat[item] item = content.gear.flat[item]
user.items.gear.owned[item.key] = true user.items.gear.owned[item.key] = true
user.markModified? 'purchased.plan.mysteryItems' user.markModified? 'purchased.plan.mysteryItems'
item.type = 'Mystery' item.notificationType = 'Mystery' # needed for website/public/js/controllers/notificationCtrl.js line 59 approx.
analyticsData = { analyticsData = {
uuid: user._id, uuid: user._id,
itemKey: item, itemKey: item,

2
migrations/mystery_items.js
View File

@@ -2,7 +2,7 @@ var _id = '';
var update = { var update = {
$addToSet: { $addToSet: {
'purchased.plan.mysteryItems':{ 'purchased.plan.mysteryItems':{
$each:['back_mystery_201507','eyewear_mystery_201507'] $each:['head_mystery_201508','armor_mystery_201508']
} }
} }
}; };

7
website/public/js/controllers/notificationCtrl.js
View File

@@ -65,7 +65,10 @@ habitrpg.controller('NotificationCtrl',
var text, notes, type; var text, notes, type;
$rootScope.playSound('Item_Drop'); $rootScope.playSound('Item_Drop');
if (after.type !== 'gear' && after.type !== 'Quest' && after.type !== 'Mystery') { // Note: For Mystery Item gear, after.type will be 'head', 'armor', etc
// so we use after.notificationType below.
if (after.type !== 'gear' && after.type !== 'Quest' && after.notificationType !== 'Mystery') {
if (after.type === 'Food') { if (after.type === 'Food') {
type = 'food'; type = 'food';
} else if (after.type === 'HatchingPotion') { } else if (after.type === 'HatchingPotion') {
@@ -94,7 +97,7 @@ habitrpg.controller('NotificationCtrl',
} else if (after.type === 'Quest') { } else if (after.type === 'Quest') {
$rootScope.selectedQuest = Content.quests[after.key]; $rootScope.selectedQuest = Content.quests[after.key];
$rootScope.openModal('questDrop', {controller:'PartyCtrl'}); $rootScope.openModal('questDrop', {controller:'PartyCtrl'});
} else if (after.type === 'Mystery') { } else if (after.notificationType === 'Mystery') {
text = Content.gear.flat[after.key].text(); text = Content.gear.flat[after.key].text();
Notification.drop(env.t('messageDropMysteryItem', {dropText: text}), after); Notification.drop(env.t('messageDropMysteryItem', {dropText: text}), after);
} else { } else {

18
website/views/shared/new-stuff.jade
View File

@@ -1,5 +1,17 @@
h5 8/19/2015 - CHEETAH PET QUEST, iPAD APP, and GRYPHON CONTEST WINNER! h5 8/24/2015 - AUGUST SUBSCRIBER ITEM SET: CHEETAH COSTUME!
hr hr
tr
td
.promo_mystery_201508.pull-right
h5 August Subscriber Item Set: Cheetah Costume!
p The August Subscriber Items have been revealed: the Cheetah Costume Item Set! All August subscribers will receive the Cheetah Costume and the Cheetah Hat. You still have six days to <a href='/#/options/settings/subscription'>subscribe</a> and receive the item set! Thank you so much for your support - we really do rely on you to keep Habitica free to use and running smoothly.
p.small.muted by Lemoness
hr
a(href='/static/old-news', target='_blank') Read older news
mixin oldNews
h5 8/19/2015 - CHEETAH PET QUEST, iPAD APP, and GRYPHON CONTEST WINNER!
tr tr
td td
.Pet-Cheetah-Base.pull-right .Pet-Cheetah-Base.pull-right
@@ -28,10 +40,6 @@ h5 8/19/2015 - CHEETAH PET QUEST, iPAD APP, and GRYPHON CONTEST WINNER!
br br
p Thank you so much to everyone who submitted names! They were very well-thought-out and very entertaining, and it was extremely difficult for the staff to make a decision. We hope you will join with us in welcoming Melior into the Habitica family! p Thank you so much to everyone who submitted names! They were very well-thought-out and very entertaining, and it was extremely difficult for the staff to make a decision. We hope you will join with us in welcoming Melior into the Habitica family!
hr
a(href='/static/old-news', target='_blank') Read older news
mixin oldNews
h5 8/13/2015 - GOLD-PURCHASABLE CARDS h5 8/13/2015 - GOLD-PURCHASABLE CARDS
tr tr
td td