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

Merge branch 'develop' into sabrecat/party-page

Browse Source
This commit is contained in:
Blade Barringer
2015-08-20 07:39:25 -05:00
parent 322785dd44 0f5f80f910
commit 65888d3f8a
55 changed files with 8651 additions and 8393 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

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

@@ -1,240 +1,240 @@
.achievement-alien {
background-image: url(spritesmith0.png);
background-position: -1860px -1756px;
background-position: -1405px -1301px;
width: 24px;
height: 26px;
}
.achievement-alpha {
background-image: url(spritesmith0.png);
background-position: -1976px -1547px;
background-position: -1976px -1820px;
width: 24px;
height: 26px;
}
.achievement-armor {
background-image: url(spritesmith0.png);
background-position: -1910px -1729px;
background-position: -1455px -1274px;
width: 24px;
height: 26px;
}
.achievement-boot {
background-image: url(spritesmith0.png);
background-position: -1885px -1729px;
background-position: -1430px -1274px;
width: 24px;
height: 26px;
}
.achievement-bow {
background-image: url(spritesmith0.png);
background-position: -1860px -1729px;
background-position: -1405px -1274px;
width: 24px;
height: 26px;
}
.achievement-cactus {
background-image: url(spritesmith0.png);
background-position: -2001px -1844px;
background-position: -1546px -1392px;
width: 24px;
height: 26px;
}
.achievement-cake {
background-image: url(spritesmith0.png);
background-position: -1976px -1844px;
background-position: -1521px -1392px;
width: 24px;
height: 26px;
}
.achievement-cave {
background-image: url(spritesmith0.png);
background-position: -1951px -1844px;
background-position: -1496px -1392px;
width: 24px;
height: 26px;
}
.achievement-coffin {
background-image: url(spritesmith0.png);
background-position: -2001px -1817px;
background-position: -1546px -1365px;
width: 24px;
height: 26px;
}
.achievement-comment {
background-image: url(spritesmith0.png);
background-position: -1976px -1817px;
background-position: -1521px -1365px;
width: 24px;
height: 26px;
}
.achievement-costumeContest {
background-image: url(spritesmith0.png);
background-position: -1951px -1817px;
background-position: -1496px -1365px;
width: 24px;
height: 26px;
}
.achievement-dilatory {
background-image: url(spritesmith0.png);
background-position: -2001px -1790px;
background-position: -1637px -1483px;
width: 24px;
height: 26px;
}
.achievement-firefox {
background-image: url(spritesmith0.png);
background-position: -1976px -1790px;
background-position: -1612px -1483px;
width: 24px;
height: 26px;
}
.achievement-greeting {
background-image: url(spritesmith0.png);
background-position: -1951px -1790px;
background-position: -1587px -1483px;
width: 24px;
height: 26px;
}
.achievement-habitBirthday {
background-image: url(spritesmith0.png);
background-position: -2001px -1763px;
background-position: -1637px -1456px;
width: 24px;
height: 26px;
}
.achievement-habiticaDay {
background-image: url(spritesmith0.png);
background-position: -1976px -1763px;
background-position: -1612px -1456px;
width: 24px;
height: 26px;
}
.achievement-heart {
background-image: url(spritesmith0.png);
background-position: -1951px -1763px;
background-position: -1587px -1456px;
width: 24px;
height: 26px;
}
.achievement-karaoke {
background-image: url(spritesmith0.png);
background-position: -2001px -1736px;
background-position: -1728px -1574px;
width: 24px;
height: 26px;
}
.achievement-ninja {
background-image: url(spritesmith0.png);
background-position: -1976px -1736px;
background-position: -1703px -1574px;
width: 24px;
height: 26px;
}
.achievement-nye {
background-image: url(spritesmith0.png);
background-position: -1951px -1736px;
background-position: -1678px -1574px;
width: 24px;
height: 26px;
}
.achievement-perfect {
background-image: url(spritesmith0.png);
background-position: -1951px -1547px;
background-position: -1951px -1820px;
width: 24px;
height: 26px;
}
.achievement-rat {
background-image: url(spritesmith0.png);
background-position: -1976px -1709px;
background-position: -1703px -1547px;
width: 24px;
height: 26px;
}
.achievement-seafoam {
background-image: url(spritesmith0.png);
background-position: -1951px -1709px;
background-position: -1678px -1547px;
width: 24px;
height: 26px;
}
.achievement-shield {
background-image: url(spritesmith0.png);
background-position: -2001px -1682px;
background-position: -1819px -1665px;
width: 24px;
height: 26px;
}
.achievement-shinySeed {
background-image: url(spritesmith0.png);
background-position: -1976px -1682px;
background-position: -1794px -1665px;
width: 24px;
height: 26px;
}
.achievement-snowball {
background-image: url(spritesmith0.png);
background-position: -1951px -1682px;
background-position: -1769px -1665px;
width: 24px;
height: 26px;
}
.achievement-spookDust {
background-image: url(spritesmith0.png);
background-position: -2001px -1655px;
background-position: -1819px -1638px;
width: 24px;
height: 26px;
}
.achievement-stoikalm {
background-image: url(spritesmith0.png);
background-position: -1976px -1655px;
background-position: -1794px -1638px;
width: 24px;
height: 26px;
}
.achievement-sun {
background-image: url(spritesmith0.png);
background-position: -1951px -1655px;
background-position: -1769px -1638px;
width: 24px;
height: 26px;
}
.achievement-sword {
background-image: url(spritesmith0.png);
background-position: -2001px -1628px;
background-position: -1910px -1756px;
width: 24px;
height: 26px;
}
.achievement-thankyou {
background-image: url(spritesmith0.png);
background-position: -1976px -1628px;
background-position: -1885px -1756px;
width: 24px;
height: 26px;
}
.achievement-thermometer {
background-image: url(spritesmith0.png);
background-position: -1951px -1628px;
background-position: -1860px -1756px;
width: 24px;
height: 26px;
}
.achievement-tree {
background-image: url(spritesmith0.png);
background-position: -2001px -1601px;
background-position: -1910px -1729px;
width: 24px;
height: 26px;
}
.achievement-triadbingo {
background-image: url(spritesmith0.png);
background-position: -1976px -1601px;
background-position: -1885px -1729px;
width: 24px;
height: 26px;
}
.achievement-ultimate-healer {
background-image: url(spritesmith0.png);
background-position: -1951px -1601px;
background-position: -1860px -1729px;
width: 24px;
height: 26px;
}
.achievement-ultimate-mage {
background-image: url(spritesmith0.png);
background-position: -2001px -1574px;
background-position: -2001px -1847px;
width: 24px;
height: 26px;
}
.achievement-ultimate-rogue {
background-image: url(spritesmith0.png);
background-position: -1976px -1574px;
background-position: -1976px -1847px;
width: 24px;
height: 26px;
}
.achievement-ultimate-warrior {
background-image: url(spritesmith0.png);
background-position: -1951px -1574px;
background-position: -1951px -1847px;
width: 24px;
height: 26px;
}
.achievement-valentine {
background-image: url(spritesmith0.png);
background-position: -2001px -1547px;
background-position: -2001px -1820px;
width: 24px;
height: 26px;
}
.achievement-wolf {
background-image: url(spritesmith0.png);
background-position: -2001px -1709px;
background-position: -1728px -1547px;
width: 24px;
height: 26px;
}
@@ -1998,13 +1998,13 @@
}
.hair_mustache_1_rainbow {
background-image: url(spritesmith0.png);
background-position: -990px -444px;
background-position: -1183px -1434px;
width: 90px;
height: 90px;
}
.customize-option.hair_mustache_1_rainbow {
background-image: url(spritesmith0.png);
background-position: -1015px -459px;
background-position: -1208px -1449px;
width: 60px;
height: 60px;
}
@@ -2022,13 +2022,13 @@
}
.hair_mustache_1_snowy {
background-image: url(spritesmith0.png);
background-position: -1365px -1434px;
background-position: -990px -444px;
width: 90px;
height: 90px;
}
.customize-option.hair_mustache_1_snowy {
background-image: url(spritesmith0.png);
background-position: -1390px -1449px;
background-position: -1015px -459px;
width: 60px;
height: 60px;
}
@@ -4026,479 +4026,527 @@
}
.hair_base_10_brown {
background-image: url(spritesmith0.png);
background-position: -1183px -1434px;
background-position: -1951px -1547px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_brown {
background-image: url(spritesmith0.png);
background-position: -1208px -1449px;
background-position: -1976px -1562px;
width: 60px;
height: 60px;
}
.hair_base_10_candycane {
background-image: url(spritesmith0.png);
background-position: -1132px -455px;
background-position: -1951px -1638px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_candycane {
background-image: url(spritesmith0.png);
background-position: -1157px -470px;
background-position: -1976px -1653px;
width: 60px;
height: 60px;
}
.hair_base_10_candycorn {
background-image: url(spritesmith0.png);
background-position: -1132px -364px;
background-position: -1951px -1729px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_candycorn {
background-image: url(spritesmith0.png);
background-position: -1157px -379px;
background-position: -1976px -1744px;
width: 60px;
height: 60px;
}
.hair_base_10_festive {
background-image: url(spritesmith0.png);
background-position: -1132px -273px;
background-position: 0px -1889px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_festive {
background-image: url(spritesmith0.png);
background-position: -1157px -288px;
background-position: -25px -1904px;
width: 60px;
height: 60px;
}
.hair_base_10_frost {
background-image: url(spritesmith0.png);
background-position: -1132px -182px;
background-position: -1365px -1434px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_frost {
background-image: url(spritesmith0.png);
background-position: -1157px -197px;
background-position: -1390px -1449px;
width: 60px;
height: 60px;
}
.hair_base_10_ghostwhite {
background-image: url(spritesmith0.png);
background-position: -1132px -91px;
background-position: -1132px -455px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_ghostwhite {
background-image: url(spritesmith0.png);
background-position: -1157px -106px;
background-position: -1157px -470px;
width: 60px;
height: 60px;
}
.hair_base_10_green {
background-image: url(spritesmith0.png);
background-position: -1132px 0px;
background-position: -1132px -364px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_green {
background-image: url(spritesmith0.png);
background-position: -1157px -15px;
background-position: -1157px -379px;
width: 60px;
height: 60px;
}
.hair_base_10_halloween {
background-image: url(spritesmith0.png);
background-position: -1001px -979px;
background-position: -1132px -273px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_halloween {
background-image: url(spritesmith0.png);
background-position: -1026px -994px;
background-position: -1157px -288px;
width: 60px;
height: 60px;
}
.hair_base_10_holly {
background-image: url(spritesmith0.png);
background-position: -910px -979px;
background-position: -1132px -182px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_holly {
background-image: url(spritesmith0.png);
background-position: -935px -994px;
background-position: -1157px -197px;
width: 60px;
height: 60px;
}
.hair_base_10_hollygreen {
background-image: url(spritesmith0.png);
background-position: -819px -979px;
background-position: -1132px -91px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_hollygreen {
background-image: url(spritesmith0.png);
background-position: -844px -994px;
background-position: -1157px -106px;
width: 60px;
height: 60px;
}
.hair_base_10_midnight {
background-image: url(spritesmith0.png);
background-position: -728px -979px;
background-position: -1132px 0px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_midnight {
background-image: url(spritesmith0.png);
background-position: -753px -994px;
background-position: -1157px -15px;
width: 60px;
height: 60px;
}
.hair_base_10_pblue {
background-image: url(spritesmith0.png);
background-position: -637px -979px;
background-position: -1001px -979px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_pblue {
background-image: url(spritesmith0.png);
background-position: -662px -994px;
background-position: -1026px -994px;
width: 60px;
height: 60px;
}
.hair_base_10_pblue2 {
background-image: url(spritesmith0.png);
background-position: -546px -979px;
background-position: -910px -979px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_pblue2 {
background-image: url(spritesmith0.png);
background-position: -571px -994px;
background-position: -935px -994px;
width: 60px;
height: 60px;
}
.hair_base_10_peppermint {
background-image: url(spritesmith0.png);
background-position: -455px -979px;
background-position: -819px -979px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_peppermint {
background-image: url(spritesmith0.png);
background-position: -480px -994px;
background-position: -844px -994px;
width: 60px;
height: 60px;
}
.hair_base_10_pgreen {
background-image: url(spritesmith0.png);
background-position: -364px -979px;
background-position: -728px -979px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_pgreen {
background-image: url(spritesmith0.png);
background-position: -389px -994px;
background-position: -753px -994px;
width: 60px;
height: 60px;
}
.hair_base_10_pgreen2 {
background-image: url(spritesmith0.png);
background-position: -273px -979px;
background-position: -637px -979px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_pgreen2 {
background-image: url(spritesmith0.png);
background-position: -298px -994px;
background-position: -662px -994px;
width: 60px;
height: 60px;
}
.hair_base_10_porange {
background-image: url(spritesmith0.png);
background-position: -182px -979px;
background-position: -546px -979px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_porange {
background-image: url(spritesmith0.png);
background-position: -207px -994px;
background-position: -571px -994px;
width: 60px;
height: 60px;
}
.hair_base_10_porange2 {
background-image: url(spritesmith0.png);
background-position: -91px -979px;
background-position: -455px -979px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_porange2 {
background-image: url(spritesmith0.png);
background-position: -116px -994px;
background-position: -480px -994px;
width: 60px;
height: 60px;
}
.hair_base_10_ppink {
background-image: url(spritesmith0.png);
background-position: 0px -979px;
background-position: -364px -979px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_ppink {
background-image: url(spritesmith0.png);
background-position: -25px -994px;
background-position: -389px -994px;
width: 60px;
height: 60px;
}
.hair_base_10_ppink2 {
background-image: url(spritesmith0.png);
background-position: -1001px -888px;
background-position: -273px -979px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_ppink2 {
background-image: url(spritesmith0.png);
background-position: -1026px -903px;
background-position: -298px -994px;
width: 60px;
height: 60px;
}
.hair_base_10_ppurple {
background-image: url(spritesmith0.png);
background-position: -910px -888px;
background-position: -182px -979px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_ppurple {
background-image: url(spritesmith0.png);
background-position: -935px -903px;
background-position: -207px -994px;
width: 60px;
height: 60px;
}
.hair_base_10_ppurple2 {
background-image: url(spritesmith0.png);
background-position: -819px -888px;
background-position: -91px -979px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_ppurple2 {
background-image: url(spritesmith0.png);
background-position: -844px -903px;
background-position: -116px -994px;
width: 60px;
height: 60px;
}
.hair_base_10_pumpkin {
background-image: url(spritesmith0.png);
background-position: -728px -888px;
background-position: 0px -979px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_pumpkin {
background-image: url(spritesmith0.png);
background-position: -753px -903px;
background-position: -25px -994px;
width: 60px;
height: 60px;
}
.hair_base_10_purple {
background-image: url(spritesmith0.png);
background-position: -637px -888px;
background-position: -1001px -888px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_purple {
background-image: url(spritesmith0.png);
background-position: -662px -903px;
background-position: -1026px -903px;
width: 60px;
height: 60px;
}
.hair_base_10_pyellow {
background-image: url(spritesmith0.png);
background-position: -546px -888px;
background-position: -910px -888px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_pyellow {
background-image: url(spritesmith0.png);
background-position: -571px -903px;
background-position: -935px -903px;
width: 60px;
height: 60px;
}
.hair_base_10_pyellow2 {
background-image: url(spritesmith0.png);
background-position: -455px -888px;
background-position: -819px -888px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_pyellow2 {
background-image: url(spritesmith0.png);
background-position: -480px -903px;
background-position: -844px -903px;
width: 60px;
height: 60px;
}
.hair_base_10_rainbow {
background-image: url(spritesmith0.png);
background-position: -364px -888px;
background-position: -728px -888px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_rainbow {
background-image: url(spritesmith0.png);
background-position: -389px -903px;
background-position: -753px -903px;
width: 60px;
height: 60px;
}
.hair_base_10_red {
background-image: url(spritesmith0.png);
background-position: -273px -888px;
background-position: -637px -888px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_red {
background-image: url(spritesmith0.png);
background-position: -298px -903px;
background-position: -662px -903px;
width: 60px;
height: 60px;
}
.hair_base_10_snowy {
background-image: url(spritesmith0.png);
background-position: -182px -888px;
background-position: -546px -888px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_snowy {
background-image: url(spritesmith0.png);
background-position: -207px -903px;
background-position: -571px -903px;
width: 60px;
height: 60px;
}
.hair_base_10_white {
background-image: url(spritesmith0.png);
background-position: -91px -888px;
background-position: -455px -888px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_white {
background-image: url(spritesmith0.png);
background-position: -116px -903px;
background-position: -480px -903px;
width: 60px;
height: 60px;
}
.hair_base_10_winternight {
background-image: url(spritesmith0.png);
background-position: 0px -888px;
background-position: -364px -888px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_winternight {
background-image: url(spritesmith0.png);
background-position: -25px -903px;
background-position: -389px -903px;
width: 60px;
height: 60px;
}
.hair_base_10_winterstar {
background-image: url(spritesmith0.png);
background-position: -990px -717px;
background-position: -273px -888px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_winterstar {
background-image: url(spritesmith0.png);
background-position: -1015px -732px;
background-position: -298px -903px;
width: 60px;
height: 60px;
}
.hair_base_10_yellow {
background-image: url(spritesmith0.png);
background-position: -990px -626px;
background-position: -182px -888px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_yellow {
background-image: url(spritesmith0.png);
background-position: -1015px -641px;
background-position: -207px -903px;
width: 60px;
height: 60px;
}
.hair_base_10_zombie {
background-image: url(spritesmith0.png);
background-position: -990px -535px;
background-position: -91px -888px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_zombie {
background-image: url(spritesmith0.png);
background-position: -1015px -550px;
background-position: -116px -903px;
width: 60px;
height: 60px;
}
.hair_base_11_TRUred {
background-image: url(spritesmith0.png);
background-position: 0px -1070px;
background-position: 0px -888px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_11_TRUred {
background-image: url(spritesmith0.png);
background-position: -25px -1085px;
background-position: -25px -903px;
width: 60px;
height: 60px;
}
.hair_base_11_aurora {
background-image: url(spritesmith0.png);
background-position: -1132px -910px;
background-position: -990px -717px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_11_aurora {
background-image: url(spritesmith0.png);
background-position: -1157px -925px;
background-position: -1015px -732px;
width: 60px;
height: 60px;
}
.hair_base_11_black {
background-image: url(spritesmith0.png);
background-position: -1132px -819px;
background-position: -990px -626px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_11_black {
background-image: url(spritesmith0.png);
background-position: -1157px -834px;
background-position: -1015px -641px;
width: 60px;
height: 60px;
}
.hair_base_11_blond {
background-image: url(spritesmith0.png);
background-position: -1132px -728px;
background-position: -990px -535px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_11_blond {
background-image: url(spritesmith0.png);
background-position: -1157px -743px;
background-position: -1015px -550px;
width: 60px;
height: 60px;
}
.hair_base_11_blue {
background-image: url(spritesmith0.png);
background-position: -1132px -637px;
background-position: 0px -1070px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_11_blue {
background-image: url(spritesmith0.png);
background-position: -1157px -652px;
background-position: -25px -1085px;
width: 60px;
height: 60px;
}
.hair_base_11_brown {
background-image: url(spritesmith0.png);
background-position: -1132px -546px;
background-position: -1132px -910px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_11_brown {
background-image: url(spritesmith0.png);
background-position: -1157px -925px;
width: 60px;
height: 60px;
}
.hair_base_11_candycane {
background-image: url(spritesmith0.png);
background-position: -1132px -819px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_11_candycane {
background-image: url(spritesmith0.png);
background-position: -1157px -834px;
width: 60px;
height: 60px;
}
.hair_base_11_candycorn {
background-image: url(spritesmith0.png);
background-position: -1132px -728px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_11_candycorn {
background-image: url(spritesmith0.png);
background-position: -1157px -743px;
width: 60px;
height: 60px;
}
.hair_base_11_festive {
background-image: url(spritesmith0.png);
background-position: -1132px -637px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_11_festive {
background-image: url(spritesmith0.png);
background-position: -1157px -652px;
width: 60px;
height: 60px;
}
.hair_base_11_frost {
background-image: url(spritesmith0.png);
background-position: -1132px -546px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_11_frost {
background-image: url(spritesmith0.png);
background-position: -1157px -561px;
width: 60px;

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 238 KiB

After

Width:  |  Height:  |  Size: 240 KiB

5928
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

5514
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: 109 KiB

After

Width:  |  Height:  |  Size: 110 KiB

1016
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: 91 KiB

After

Width:  |  Height:  |  Size: 89 KiB

1050
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: 554 KiB

After

Width:  |  Height:  |  Size: 586 KiB

1618
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: 235 KiB

After

Width:  |  Height:  |  Size: 243 KiB

1540
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: 202 KiB

After

Width:  |  Height:  |  Size: 204 KiB

BIN
common/img/sprites/spritesmith/quests/inventory_quest_scroll_cheetah.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.4 KiB

BIN
common/img/sprites/spritesmith/quests/quest_cheetah.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.3 KiB

BIN
common/img/sprites/spritesmith/stable/eggs/Pet_Egg_Cheetah.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 18 KiB

BIN
common/img/sprites/spritesmith/stable/mounts/Mount_Body_Cheetah-Base.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
common/img/sprites/spritesmith/stable/mounts/Mount_Body_Cheetah-CottonCandyBlue.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
common/img/sprites/spritesmith/stable/mounts/Mount_Body_Cheetah-CottonCandyPink.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
common/img/sprites/spritesmith/stable/mounts/Mount_Body_Cheetah-Desert.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
common/img/sprites/spritesmith/stable/mounts/Mount_Body_Cheetah-Golden.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
common/img/sprites/spritesmith/stable/mounts/Mount_Body_Cheetah-Red.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
common/img/sprites/spritesmith/stable/mounts/Mount_Body_Cheetah-Shade.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
common/img/sprites/spritesmith/stable/mounts/Mount_Body_Cheetah-Skeleton.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 873 B

BIN
common/img/sprites/spritesmith/stable/mounts/Mount_Body_Cheetah-White.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
common/img/sprites/spritesmith/stable/mounts/Mount_Body_Cheetah-Zombie.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
common/img/sprites/spritesmith/stable/mounts/Mount_Head_Cheetah-Base.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
common/img/sprites/spritesmith/stable/mounts/Mount_Head_Cheetah-CottonCandyBlue.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
common/img/sprites/spritesmith/stable/mounts/Mount_Head_Cheetah-CottonCandyPink.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
common/img/sprites/spritesmith/stable/mounts/Mount_Head_Cheetah-Desert.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
common/img/sprites/spritesmith/stable/mounts/Mount_Head_Cheetah-Golden.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
common/img/sprites/spritesmith/stable/mounts/Mount_Head_Cheetah-Red.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
common/img/sprites/spritesmith/stable/mounts/Mount_Head_Cheetah-Shade.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
common/img/sprites/spritesmith/stable/mounts/Mount_Head_Cheetah-Skeleton.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 797 B

BIN
common/img/sprites/spritesmith/stable/mounts/Mount_Head_Cheetah-White.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
common/img/sprites/spritesmith/stable/mounts/Mount_Head_Cheetah-Zombie.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
common/img/sprites/spritesmith/stable/pets/Pet-Cheetah-Base.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.4 KiB

BIN
common/img/sprites/spritesmith/stable/pets/Pet-Cheetah-CottonCandyBlue.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.3 KiB

BIN
common/img/sprites/spritesmith/stable/pets/Pet-Cheetah-CottonCandyPink.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.4 KiB

BIN
common/img/sprites/spritesmith/stable/pets/Pet-Cheetah-Desert.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.4 KiB

BIN
common/img/sprites/spritesmith/stable/pets/Pet-Cheetah-Golden.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.4 KiB

BIN
common/img/sprites/spritesmith/stable/pets/Pet-Cheetah-Red.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.4 KiB

BIN
common/img/sprites/spritesmith/stable/pets/Pet-Cheetah-Shade.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.3 KiB

BIN
common/img/sprites/spritesmith/stable/pets/Pet-Cheetah-Skeleton.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.2 KiB

BIN
common/img/sprites/spritesmith/stable/pets/Pet-Cheetah-White.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.3 KiB

BIN
common/img/sprites/spritesmith/stable/pets/Pet-Cheetah-Zombie.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.6 KiB

3
common/locales/en/content.json
View File

@@ -96,6 +96,9 @@
"questEggWhaleText": "Whale",
"questEggWhaleAdjective": "splashy",
"questEggCheetahText": "Cheetah",
"questEggCheetahAdjective": "honest",
"eggNotes": "Find a hatching potion to pour on this egg, and it will hatch into a <%= eggAdjective(locale) %> <%= eggText(locale) %>.",
"hatchingPotionBase": "Base",

9
common/locales/en/questsContent.json
View File

@@ -277,5 +277,12 @@
"questDilatoryDistress3Boss": "Adva, the Usurping Mermaid",
"questDilatoryDistress3DropFish": "Fish (Food)",
"questDilatoryDistress3DropWeapon": "Trident of Crashing Tides (Weapon)",
"questDilatoryDistress3DropShield": "Moonpearl Shield (Shield-Hand Item)"
"questDilatoryDistress3DropShield": "Moonpearl Shield (Shield-Hand Item)",
"questCheetahText": "Such a Cheetah",
"questCheetahNotes": "As you hike across the Sloensteadi Savannah with your friends @PainterProphet, @tivaquinn, @Unruly Hyena, and @Crawford, you're startled to see a Cheetah screeching past with a new Habitican clamped in its jaws. Under the Cheetah's scorching paws, tasks burn away as though complete -- before anyone has the chance to actually finish them! The Habitican sees you and yells, \"Please help me! This Cheetah is making me level too quickly, but I'm not getting anything done. I want to slow down and enjoy the game. Make it stop!\" You fondly remember your own fledgling days, and know that you have to help the newbie by stopping the Cheetah!",
"questCheetahCompletion": "The new Habitican is breathing heavily after the wild ride, but thanks you and your friends for your help. \"I'm glad that Cheetah won't be able to grab anyone else. It did leave some Cheetah eggs for us, so maybe we can raise them into more trustworthy pets!\"",
"questCheetahBoss": "Cheetah",
"questCheetahDropCheetahEgg": "Cheetah (Egg)",
"questCheetahUnlockText": "Unlocks purchasable Cheetah eggs in the Market"
}

21
common/script/content.coffee
View File

@@ -1095,6 +1095,7 @@ api.questEggs =
Sheep: text: t('questEggSheepText'), adjective: t('questEggSheepAdjective'), canBuy: false
Cuttlefish: text: t('questEggCuttlefishText'), adjective: t('questEggCuttlefishAdjective'), canBuy: false
Whale: text: t('questEggWhaleText'), adjective: t('questEggWhaleAdjective'), canBuy: false
Cheetah: text: t('questEggCheetahText'), adjective: t('questEggCheetahAdjective'), canBuy: false
_.each api.questEggs, (egg,key) ->
_.defaults egg,
@@ -2044,6 +2045,26 @@ api.quests =
gp: 0
exp: 650
cheetah:
text: t('questCheetahText')
notes: t('questCheetahNotes')
completion: t('questCheetahCompletion')
value: 4
category: 'pet'
boss:
name: t('questCheetahBoss')
hp: 600
str: 1.5
drop:
items: [
{type: 'eggs', key: 'Cheetah', text: t('questCheetahDropCheetahEgg')}
{type: 'eggs', key: 'Cheetah', text: t('questCheetahDropCheetahEgg')}
{type: 'eggs', key: 'Cheetah', text: t('questCheetahDropCheetahEgg')}
]
gp: 43
exp: 350
unlock: t('questCheetahUnlockText')
_.each api.quests, (v,key) ->
_.defaults v, {key,canBuy:true}
b = v.boss

2
package.json
View File

@@ -116,7 +116,7 @@
"rewire": "^2.3.3",
"rimraf": "^2.2.8",
"shelljs": "^0.4.0",
"sinon": "^1.12.2",
"sinon": "1.15.4",
"sinon-chai": "^2.7.0",
"superagent": "~0.15.7",
"superagent-defaults": "~0.1.5",

2
website/public/js/controllers/inviteToGroupCtrl.js
View File

@@ -1,4 +1,4 @@
"use strict";
'use strict';
habitrpg.controller('InviteToGroupCtrl', ['$scope', 'User', 'Groups', 'injectedGroup', '$http', 'Notification', function($scope, User, Groups, injectedGroup, $http, Notification) {
$scope.group = injectedGroup;

2
website/views/options/inventory/drops.jade
View File

@@ -112,7 +112,7 @@
span.Pet_Currency_Gem1x.inline-gems
//- buyable quest eggs. TODO: Get this from a collection so we don't have to maintain this ridiculous comma-delimited list
//- The hard part will be the trex stuff, since it is allowed to exist with two quests
each egg,quest in {gryphon:'Gryphon',hedgehog:'Hedgehog',ghost_stag:'Deer',rat:'Rat',octopus:'Octopus',dilatory_derby:'Seahorse',harpy:'Parrot',rooster:'Rooster',spider:'Spider',owl:'Owl',penguin:'Penguin',rock:'Rock',bunny:'Bunny',slime:'Slime',sheep:'Sheep',kraken:'Cuttlefish',whale:'Whale'}
each egg,quest in {gryphon:'Gryphon',hedgehog:'Hedgehog',ghost_stag:'Deer',rat:'Rat',octopus:'Octopus',dilatory_derby:'Seahorse',harpy:'Parrot',rooster:'Rooster',spider:'Spider',owl:'Owl',penguin:'Penguin',rock:'Rock',bunny:'Bunny',slime:'Slime',sheep:'Sheep',kraken:'Cuttlefish',whale:'Whale',cheetah:'Cheetah'}
div(ng-show='user.achievements.quests.#{quest} > 0')
button.customize-option(class='Pet_Egg_#{egg}',
popover='{{::Content.eggs.#{egg}.notes()}}', popover-append-to-body='true',

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

@@ -1,5 +1,38 @@
h5 8/13/2015 - GOLD-PURCHASABLE CARDS
h5 8/19/2015 - CHEETAH PET QUEST, iPAD APP, and GRYPHON CONTEST WINNER!
hr
tr
td
.Pet-Cheetah-Base.pull-right
h5 Cheetah Pet Quest
p A new pet quest is available in the <a href='/#/options/inventory/quests'>Quests Page</a>: The Dreadful Cheetah! A Cheetah is speeding past incomplete tasks and burning them up before people can complete them. Can you put on the brakes? If so, you’ll be awarded with some cheetah eggs!
p.small.muted by PainterProphet, tivaquinn, Unruly Hyena, Crawford, Janet Mongilio, Lemoness, and SabreCat
tr
td
h5 iOS Update and iPad App
p There’s a new iOS update! One of our awesome open-source contributors, Shadallark, has made our Habitica iOS app Universal so that it natively supports iPads. Enjoy all the new space for your tasks! We've also fixed several bugs, and excellent contributor kylefox has added a search bar.
br
p If you like the direction that we’ve been taking the app, please consider leaving us a review. It means a lot to us :) Questions? Concerns? Don't hesitate to email <a href='mailto:mobile@habitica.com' target='_blank'>mobile@habitica.com</a> and we will happily help you!
br
p This is an example of our fantastic open-source community at work - since our developers are spending all their time on the Android app, it would have been a long while before we could develop an iPad version if it weren’t for our excellent volunteers!
br
p Speaking of which, we are now accepting translations for the iOS app on Transifex <a href='https://www.transifex.com/habitrpg/habitica-ios/' target='_blank'>here</a>. If you speak another language, we’d love your help!
p.small.muted by Shalladark, kylefox, and viirus
tr
td
span.Mount_Body_Gryphon-RoyalPurple.pull-right
span.Mount_Head_Gryphon-RoyalPurple.pull-right(style='margin:0')
h5 Gryphon Contest Winner
p After sorting through over 1600 entries, we finally have a name for our Royal Purple Gryphon: MELIOR! "Melior" is Latin for "better," because Habitica is a place where everyone is striving to become better at their goals in their quest to improve their lives.
br
p The name "Melior" was submitted by awesome user NobleTheSecond, who has received their prize. Congratulations! A secondary prize has also been awarded to TangyDragonBBQ, who independently submitted a slightly different variant of that name.
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!
hr
a(href='/static/old-news', target='_blank') Read older news
mixin oldNews
h5 8/13/2015 - GOLD-PURCHASABLE CARDS
tr
td
.inventory_special_greeting.pull-right
@@ -10,10 +43,6 @@ h5 8/13/2015 - GOLD-PURCHASABLE CARDS
p Enjoy!
p.small.muted by PainterProphet, Teto Is Great, Lemoness, and SabreCat
hr
a(href='/static/old-news', target='_blank') Read older news
mixin oldNews
h5 8/4/2015 - NEW ITEMS IN THE ENCHANTED ARMOIRE AND AUGUST BACKGROUNDS
tr
td