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' of github.com:HabitRPG/habitrpg-shared into common-convert

Browse Source 
Conflicts:
	common/dist/scripts/habitrpg-shared.js
	common/dist/sprites/habitrpg-shared.css
This commit is contained in:
Blade Barringer
2015-02-12 15:40:12 -06:00
parent 51b90afb34 36dc1b42aa
commit cb7f382a85
50 changed files with 14045 additions and 13613 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14346
common/dist/scripts/habitrpg-shared.js vendored
View File

File diff suppressed because it is too large Load Diff

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

File diff suppressed because one or more lines are too long

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

@@ -1884,13 +1884,13 @@
}
.hair_mustache_1_winternight {
background-image: url(spritesmith0.png);
background-position: -425px -592px;
background-position: -1394px -182px;
width: 90px;
height: 90px;
}
.customize-option.hair_mustache_1_winternight {
background-image: url(spritesmith0.png);
background-position: -450px -607px;
background-position: -1419px -197px;
width: 60px;
height: 60px;
}
@@ -1920,13 +1920,13 @@
}
.hair_mustache_1_zombie {
background-image: url(spritesmith0.png);
background-position: -1394px -455px;
background-position: -425px -592px;
width: 90px;
height: 90px;
}
.customize-option.hair_mustache_1_zombie {
background-image: url(spritesmith0.png);
background-position: -1419px -470px;
background-position: -450px -607px;
width: 60px;
height: 60px;
}
@@ -3670,241 +3670,313 @@
width: 60px;
height: 60px;
}
.hair_base_10_festive {
.hair_base_10_candycorn {
background-image: url(spritesmith0.png);
background-position: -1758px -1365px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_festive {
.customize-option.hair_base_10_candycorn {
background-image: url(spritesmith0.png);
background-position: -1783px -1380px;
width: 60px;
height: 60px;
}
.hair_base_10_frost {
.hair_base_10_festive {
background-image: url(spritesmith0.png);
background-position: -1758px -1456px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_frost {
.customize-option.hair_base_10_festive {
background-image: url(spritesmith0.png);
background-position: -1783px -1471px;
width: 60px;
height: 60px;
}
.hair_base_10_green {
.hair_base_10_frost {
background-image: url(spritesmith0.png);
background-position: -1758px -1547px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_green {
.customize-option.hair_base_10_frost {
background-image: url(spritesmith0.png);
background-position: -1783px -1562px;
width: 60px;
height: 60px;
}
.hair_base_10_holly {
.hair_base_10_ghostwhite {
background-image: url(spritesmith0.png);
background-position: -1758px -1638px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_holly {
.customize-option.hair_base_10_ghostwhite {
background-image: url(spritesmith0.png);
background-position: -1783px -1653px;
width: 60px;
height: 60px;
}
.hair_base_10_hollygreen {
.hair_base_10_green {
background-image: url(spritesmith0.png);
background-position: 0px -1741px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_hollygreen {
.customize-option.hair_base_10_green {
background-image: url(spritesmith0.png);
background-position: -25px -1756px;
width: 60px;
height: 60px;
}
.hair_base_10_pblue {
.hair_base_10_halloween {
background-image: url(spritesmith0.png);
background-position: -91px -1741px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_pblue {
.customize-option.hair_base_10_halloween {
background-image: url(spritesmith0.png);
background-position: -116px -1756px;
width: 60px;
height: 60px;
}
.hair_base_10_peppermint {
.hair_base_10_holly {
background-image: url(spritesmith0.png);
background-position: -182px -1741px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_peppermint {
.customize-option.hair_base_10_holly {
background-image: url(spritesmith0.png);
background-position: -207px -1756px;
width: 60px;
height: 60px;
}
.hair_base_10_hollygreen {
background-image: url(spritesmith0.png);
background-position: -273px -1741px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_hollygreen {
background-image: url(spritesmith0.png);
background-position: -298px -1756px;
width: 60px;
height: 60px;
}
.hair_base_10_midnight {
background-image: url(spritesmith0.png);
background-position: -364px -1741px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_midnight {
background-image: url(spritesmith0.png);
background-position: -389px -1756px;
width: 60px;
height: 60px;
}
.hair_base_10_pblue {
background-image: url(spritesmith0.png);
background-position: -455px -1741px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_pblue {
background-image: url(spritesmith0.png);
background-position: -480px -1756px;
width: 60px;
height: 60px;
}
.hair_base_10_peppermint {
background-image: url(spritesmith0.png);
background-position: -546px -1741px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_peppermint {
background-image: url(spritesmith0.png);
background-position: -571px -1756px;
width: 60px;
height: 60px;
}
.hair_base_10_pgreen {
background-image: url(spritesmith0.png);
background-position: -1394px -182px;
background-position: -637px -1741px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_pgreen {
background-image: url(spritesmith0.png);
background-position: -1419px -197px;
background-position: -662px -1756px;
width: 60px;
height: 60px;
}
.hair_base_10_porange {
background-image: url(spritesmith0.png);
background-position: -698px -592px;
background-position: -728px -1741px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_porange {
background-image: url(spritesmith0.png);
background-position: -723px -607px;
background-position: -753px -1756px;
width: 60px;
height: 60px;
}
.hair_base_10_ppink {
background-image: url(spritesmith0.png);
background-position: -607px -592px;
background-position: -1394px -455px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_ppink {
background-image: url(spritesmith0.png);
background-position: -632px -607px;
background-position: -1419px -470px;
width: 60px;
height: 60px;
}
.hair_base_10_ppurple {
background-image: url(spritesmith0.png);
background-position: -516px -592px;
background-position: -698px -592px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_ppurple {
background-image: url(spritesmith0.png);
background-position: -541px -607px;
background-position: -723px -607px;
width: 60px;
height: 60px;
}
.hair_base_10_pumpkin {
background-image: url(spritesmith0.png);
background-position: -607px -592px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_pumpkin {
background-image: url(spritesmith0.png);
background-position: -632px -607px;
width: 60px;
height: 60px;
}
.hair_base_10_purple {
background-image: url(spritesmith0.png);
background-position: -728px -831px;
background-position: -516px -592px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_purple {
background-image: url(spritesmith0.png);
background-position: -753px -846px;
background-position: -541px -607px;
width: 60px;
height: 60px;
}
.hair_base_10_pyellow {
background-image: url(spritesmith0.png);
background-position: -637px -831px;
background-position: -728px -831px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_pyellow {
background-image: url(spritesmith0.png);
background-position: -662px -846px;
background-position: -753px -846px;
width: 60px;
height: 60px;
}
.hair_base_10_rainbow {
background-image: url(spritesmith0.png);
background-position: -546px -831px;
background-position: -637px -831px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_rainbow {
background-image: url(spritesmith0.png);
background-position: -571px -846px;
background-position: -662px -846px;
width: 60px;
height: 60px;
}
.hair_base_10_red {
background-image: url(spritesmith0.png);
background-position: -455px -831px;
background-position: -546px -831px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_red {
background-image: url(spritesmith0.png);
background-position: -480px -846px;
background-position: -571px -846px;
width: 60px;
height: 60px;
}
.hair_base_10_snowy {
background-image: url(spritesmith0.png);
background-position: -364px -831px;
background-position: -455px -831px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_snowy {
background-image: url(spritesmith0.png);
background-position: -389px -846px;
background-position: -480px -846px;
width: 60px;
height: 60px;
}
.hair_base_10_white {
background-image: url(spritesmith0.png);
background-position: -273px -831px;
background-position: -364px -831px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_white {
background-image: url(spritesmith0.png);
background-position: -298px -846px;
background-position: -389px -846px;
width: 60px;
height: 60px;
}
.hair_base_10_winternight {
background-image: url(spritesmith0.png);
background-position: -182px -831px;
background-position: -273px -831px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_winternight {
background-image: url(spritesmith0.png);
background-position: -207px -846px;
background-position: -298px -846px;
width: 60px;
height: 60px;
}
.hair_base_10_winterstar {
background-image: url(spritesmith0.png);
background-position: -91px -831px;
background-position: -182px -831px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_winterstar {
background-image: url(spritesmith0.png);
background-position: -116px -846px;
background-position: -207px -846px;
width: 60px;
height: 60px;
}
.hair_base_10_yellow {
background-image: url(spritesmith0.png);
background-position: 0px -831px;
background-position: -91px -831px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_yellow {
background-image: url(spritesmith0.png);
background-position: -116px -846px;
width: 60px;
height: 60px;
}
.hair_base_10_zombie {
background-image: url(spritesmith0.png);
background-position: 0px -831px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_zombie {
background-image: url(spritesmith0.png);
background-position: -25px -846px;
width: 60px;
@@ -3994,133 +4066,133 @@
width: 60px;
height: 60px;
}
.hair_base_11_festive {
.hair_base_11_candycorn {
background-image: url(spritesmith0.png);
background-position: -848px -91px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_11_festive {
.customize-option.hair_base_11_candycorn {
background-image: url(spritesmith0.png);
background-position: -873px -106px;
width: 60px;
height: 60px;
}
.hair_base_11_frost {
.hair_base_11_festive {
background-image: url(spritesmith0.png);
background-position: -848px 0px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_11_frost {
.customize-option.hair_base_11_festive {
background-image: url(spritesmith0.png);
background-position: -873px -15px;
width: 60px;
height: 60px;
}
.hair_base_11_green {
.hair_base_11_frost {
background-image: url(spritesmith0.png);
background-position: -728px -740px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_11_green {
.customize-option.hair_base_11_frost {
background-image: url(spritesmith0.png);
background-position: -753px -755px;
width: 60px;
height: 60px;
}
.hair_base_11_holly {
.hair_base_11_ghostwhite {
background-image: url(spritesmith0.png);
background-position: -637px -740px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_11_holly {
.customize-option.hair_base_11_ghostwhite {
background-image: url(spritesmith0.png);
background-position: -662px -755px;
width: 60px;
height: 60px;
}
.hair_base_11_hollygreen {
.hair_base_11_green {
background-image: url(spritesmith0.png);
background-position: -546px -740px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_11_hollygreen {
.customize-option.hair_base_11_green {
background-image: url(spritesmith0.png);
background-position: -571px -755px;
width: 60px;
height: 60px;
}
.hair_base_11_pblue {
.hair_base_11_halloween {
background-image: url(spritesmith0.png);
background-position: -455px -740px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_11_pblue {
.customize-option.hair_base_11_halloween {
background-image: url(spritesmith0.png);
background-position: -480px -755px;
width: 60px;
height: 60px;
}
.hair_base_11_peppermint {
.hair_base_11_holly {
background-image: url(spritesmith0.png);
background-position: -364px -740px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_11_peppermint {
.customize-option.hair_base_11_holly {
background-image: url(spritesmith0.png);
background-position: -389px -755px;
width: 60px;
height: 60px;
}
.hair_base_11_pgreen {
.hair_base_11_hollygreen {
background-image: url(spritesmith0.png);
background-position: -273px -740px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_11_pgreen {
.customize-option.hair_base_11_hollygreen {
background-image: url(spritesmith0.png);
background-position: -298px -755px;
width: 60px;
height: 60px;
}
.hair_base_11_porange {
.hair_base_11_midnight {
background-image: url(spritesmith0.png);
background-position: -182px -740px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_11_porange {
.customize-option.hair_base_11_midnight {
background-image: url(spritesmith0.png);
background-position: -207px -755px;
width: 60px;
height: 60px;
}
.hair_base_11_ppink {
.hair_base_11_pblue {
background-image: url(spritesmith0.png);
background-position: -91px -740px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_11_ppink {
.customize-option.hair_base_11_pblue {
background-image: url(spritesmith0.png);
background-position: -116px -755px;
width: 60px;
height: 60px;
}
.hair_base_11_ppurple {
.hair_base_11_peppermint {
background-image: url(spritesmith0.png);
background-position: 0px -740px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_11_ppurple {
.customize-option.hair_base_11_peppermint {
background-image: url(spritesmith0.png);
background-position: -25px -755px;
width: 60px;

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 224 KiB

After

Width:  |  Height:  |  Size: 224 KiB

5348
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: 74 KiB

After

Width:  |  Height:  |  Size: 75 KiB

4614
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: 184 KiB

After

Width:  |  Height:  |  Size: 182 KiB

894
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: 481 KiB

After

Width:  |  Height:  |  Size: 479 KiB

838
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: 318 KiB

After

Width:  |  Height:  |  Size: 319 KiB

1414
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: 285 KiB

After

Width:  |  Height:  |  Size: 292 KiB

BIN
common/img/sprites/spritesmith/customize/hair/hair_base_10_candycorn.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.0 KiB

BIN
common/img/sprites/spritesmith/customize/hair/hair_base_10_ghostwhite.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.0 KiB

BIN
common/img/sprites/spritesmith/customize/hair/hair_base_10_halloween.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.9 KiB

BIN
common/img/sprites/spritesmith/customize/hair/hair_base_10_midnight.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.0 KiB

BIN
common/img/sprites/spritesmith/customize/hair/hair_base_10_pumpkin.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.0 KiB

BIN
common/img/sprites/spritesmith/customize/hair/hair_base_10_zombie.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.0 KiB

BIN
common/img/sprites/spritesmith/customize/hair/hair_base_11_candycorn.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.0 KiB

BIN
common/img/sprites/spritesmith/customize/hair/hair_base_11_ghostwhite.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.0 KiB

BIN
common/img/sprites/spritesmith/customize/hair/hair_base_11_halloween.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.9 KiB

BIN
common/img/sprites/spritesmith/customize/hair/hair_base_11_midnight.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.0 KiB

BIN
common/img/sprites/spritesmith/customize/hair/hair_base_11_pumpkin.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.0 KiB

BIN
common/img/sprites/spritesmith/customize/hair/hair_base_11_zombie.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.0 KiB

BIN
common/img/sprites/spritesmith/customize/hair/hair_base_12_candycorn.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.0 KiB

BIN
common/img/sprites/spritesmith/customize/hair/hair_base_12_ghostwhite.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.0 KiB

BIN
common/img/sprites/spritesmith/customize/hair/hair_base_12_halloween.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.9 KiB

BIN
common/img/sprites/spritesmith/customize/hair/hair_base_12_midnight.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.0 KiB

BIN
common/img/sprites/spritesmith/customize/hair/hair_base_12_pumpkin.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.0 KiB

BIN
common/img/sprites/spritesmith/customize/hair/hair_base_12_zombie.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.0 KiB

BIN
common/img/sprites/spritesmith/customize/hair/hair_base_13_candycorn.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.0 KiB

BIN
common/img/sprites/spritesmith/customize/hair/hair_base_13_ghostwhite.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.0 KiB

BIN
common/img/sprites/spritesmith/customize/hair/hair_base_13_halloween.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.0 KiB

BIN
common/img/sprites/spritesmith/customize/hair/hair_base_13_midnight.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.1 KiB

BIN
common/img/sprites/spritesmith/customize/hair/hair_base_13_pumpkin.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.1 KiB

BIN
common/img/sprites/spritesmith/customize/hair/hair_base_13_zombie.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.1 KiB

BIN
common/img/sprites/spritesmith/customize/hair/hair_base_14_candycorn.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.0 KiB

BIN
common/img/sprites/spritesmith/customize/hair/hair_base_14_ghostwhite.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.0 KiB

BIN
common/img/sprites/spritesmith/customize/hair/hair_base_14_halloween.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.9 KiB

BIN
common/img/sprites/spritesmith/customize/hair/hair_base_14_midnight.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.0 KiB

BIN
common/img/sprites/spritesmith/customize/hair/hair_base_14_pumpkin.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.0 KiB

BIN
common/img/sprites/spritesmith/customize/hair/hair_base_14_zombie.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.0 KiB

BIN
common/img/sprites/spritesmith/customize/hair/hair_base_9_candycorn.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.0 KiB

BIN
common/img/sprites/spritesmith/customize/hair/hair_base_9_ghostwhite.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.0 KiB

BIN
common/img/sprites/spritesmith/customize/hair/hair_base_9_halloween.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.9 KiB

BIN
common/img/sprites/spritesmith/customize/hair/hair_base_9_midnight.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.0 KiB

BIN
common/img/sprites/spritesmith/customize/hair/hair_base_9_pumpkin.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.0 KiB

BIN
common/img/sprites/spritesmith/customize/hair/hair_base_9_zombie.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.0 KiB