Merge branch 'joyclark-new_mount_heads' into develop

This commit is contained in:
Blade Barringer 2015-12-12 17:16:36 -06:00
commit 81067efd19
358 changed files with 3088 additions and 1012 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because it is too large Load diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 156 KiB

View file

@ -0,0 +1,204 @@
.Pet-Whale-CottonCandyBlue {
background-image: url(spritesmith-main-11.png);
background-position: -82px 0px;
width: 81px;
height: 99px;
}
.Pet-Whale-CottonCandyPink {
background-image: url(spritesmith-main-11.png);
background-position: -164px -300px;
width: 81px;
height: 99px;
}
.Pet-Whale-Desert {
background-image: url(spritesmith-main-11.png);
background-position: -164px 0px;
width: 81px;
height: 99px;
}
.Pet-Whale-Golden {
background-image: url(spritesmith-main-11.png);
background-position: 0px -100px;
width: 81px;
height: 99px;
}
.Pet-Whale-Red {
background-image: url(spritesmith-main-11.png);
background-position: -82px -100px;
width: 81px;
height: 99px;
}
.Pet-Whale-Shade {
background-image: url(spritesmith-main-11.png);
background-position: -164px -100px;
width: 81px;
height: 99px;
}
.Pet-Whale-Skeleton {
background-image: url(spritesmith-main-11.png);
background-position: -246px 0px;
width: 81px;
height: 99px;
}
.Pet-Whale-White {
background-image: url(spritesmith-main-11.png);
background-position: -246px -100px;
width: 81px;
height: 99px;
}
.Pet-Whale-Zombie {
background-image: url(spritesmith-main-11.png);
background-position: 0px -200px;
width: 81px;
height: 99px;
}
.Pet-Wolf-Base {
background-image: url(spritesmith-main-11.png);
background-position: -82px -200px;
width: 81px;
height: 99px;
}
.Pet-Wolf-CottonCandyBlue {
background-image: url(spritesmith-main-11.png);
background-position: -164px -200px;
width: 81px;
height: 99px;
}
.Pet-Wolf-CottonCandyPink {
background-image: url(spritesmith-main-11.png);
background-position: -246px -200px;
width: 81px;
height: 99px;
}
.Pet-Wolf-Desert {
background-image: url(spritesmith-main-11.png);
background-position: -328px 0px;
width: 81px;
height: 99px;
}
.Pet-Wolf-Golden {
background-image: url(spritesmith-main-11.png);
background-position: -328px -100px;
width: 81px;
height: 99px;
}
.Pet-Wolf-Peppermint {
background-image: url(spritesmith-main-11.png);
background-position: -328px -200px;
width: 81px;
height: 99px;
}
.Pet-Wolf-Red {
background-image: url(spritesmith-main-11.png);
background-position: 0px -300px;
width: 81px;
height: 99px;
}
.Pet-Wolf-Shade {
background-image: url(spritesmith-main-11.png);
background-position: -82px -300px;
width: 81px;
height: 99px;
}
.Pet-Wolf-Skeleton {
background-image: url(spritesmith-main-11.png);
background-position: 0px 0px;
width: 81px;
height: 99px;
}
.Pet-Wolf-Spooky {
background-image: url(spritesmith-main-11.png);
background-position: -246px -300px;
width: 81px;
height: 99px;
}
.Pet-Wolf-Veteran {
background-image: url(spritesmith-main-11.png);
background-position: -328px -300px;
width: 81px;
height: 99px;
}
.Pet-Wolf-White {
background-image: url(spritesmith-main-11.png);
background-position: -410px 0px;
width: 81px;
height: 99px;
}
.Pet-Wolf-Zombie {
background-image: url(spritesmith-main-11.png);
background-position: -410px -100px;
width: 81px;
height: 99px;
}
.Pet_HatchingPotion_Base {
background-image: url(spritesmith-main-11.png);
background-position: -410px -252px;
width: 48px;
height: 51px;
}
.Pet_HatchingPotion_CottonCandyBlue {
background-image: url(spritesmith-main-11.png);
background-position: -147px -400px;
width: 48px;
height: 51px;
}
.Pet_HatchingPotion_CottonCandyPink {
background-image: url(spritesmith-main-11.png);
background-position: -410px -304px;
width: 48px;
height: 51px;
}
.Pet_HatchingPotion_Desert {
background-image: url(spritesmith-main-11.png);
background-position: 0px -400px;
width: 48px;
height: 51px;
}
.Pet_HatchingPotion_Golden {
background-image: url(spritesmith-main-11.png);
background-position: -49px -400px;
width: 48px;
height: 51px;
}
.Pet_HatchingPotion_Peppermint {
background-image: url(spritesmith-main-11.png);
background-position: -98px -400px;
width: 48px;
height: 51px;
}
.Pet_HatchingPotion_Red {
background-image: url(spritesmith-main-11.png);
background-position: -410px -200px;
width: 48px;
height: 51px;
}
.Pet_HatchingPotion_Shade {
background-image: url(spritesmith-main-11.png);
background-position: -196px -400px;
width: 48px;
height: 51px;
}
.Pet_HatchingPotion_Skeleton {
background-image: url(spritesmith-main-11.png);
background-position: -245px -400px;
width: 48px;
height: 51px;
}
.Pet_HatchingPotion_Spooky {
background-image: url(spritesmith-main-11.png);
background-position: -294px -400px;
width: 48px;
height: 51px;
}
.Pet_HatchingPotion_White {
background-image: url(spritesmith-main-11.png);
background-position: -343px -400px;
width: 48px;
height: 51px;
}
.Pet_HatchingPotion_Zombie {
background-image: url(spritesmith-main-11.png);
background-position: -392px -400px;
width: 48px;
height: 51px;
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.6 KiB

View file

@ -1342,85 +1342,85 @@
width: 135px;
height: 135px;
}
.Pet-BearCub-Base {
.Mount_Icon_BearCub-Base {
background-image: url(spritesmith-main-8.png);
background-position: 0px -1634px;
width: 81px;
height: 99px;
}
.Pet-BearCub-CottonCandyBlue {
.Mount_Icon_BearCub-CottonCandyBlue {
background-image: url(spritesmith-main-8.png);
background-position: -1634px -1160px;
width: 81px;
height: 99px;
}
.Pet-BearCub-CottonCandyPink {
.Mount_Icon_BearCub-CottonCandyPink {
background-image: url(spritesmith-main-8.png);
background-position: -1634px -1260px;
width: 81px;
height: 99px;
}
.Pet-BearCub-Desert {
.Mount_Icon_BearCub-Desert {
background-image: url(spritesmith-main-8.png);
background-position: -1634px -1360px;
width: 81px;
height: 99px;
}
.Pet-BearCub-Golden {
.Mount_Icon_BearCub-Golden {
background-image: url(spritesmith-main-8.png);
background-position: -1634px -1460px;
width: 81px;
height: 99px;
}
.Pet-BearCub-Peppermint {
.Mount_Icon_BearCub-Peppermint {
background-image: url(spritesmith-main-8.png);
background-position: -593px -544px;
width: 81px;
height: 99px;
}
.Pet-BearCub-Polar {
.Mount_Icon_BearCub-Polar {
background-image: url(spritesmith-main-8.png);
background-position: -574px -1634px;
width: 81px;
height: 99px;
}
.Pet-BearCub-Red {
.Mount_Icon_BearCub-Red {
background-image: url(spritesmith-main-8.png);
background-position: -82px -1634px;
width: 81px;
height: 99px;
}
.Pet-BearCub-Shade {
.Mount_Icon_BearCub-Shade {
background-image: url(spritesmith-main-8.png);
background-position: -164px -1634px;
width: 81px;
height: 99px;
}
.Pet-BearCub-Skeleton {
.Mount_Icon_BearCub-Skeleton {
background-image: url(spritesmith-main-8.png);
background-position: -246px -1634px;
width: 81px;
height: 99px;
}
.Pet-BearCub-Spooky {
.Mount_Icon_BearCub-Spooky {
background-image: url(spritesmith-main-8.png);
background-position: -328px -1634px;
width: 81px;
height: 99px;
}
.Pet-BearCub-White {
.Mount_Icon_BearCub-White {
background-image: url(spritesmith-main-8.png);
background-position: -410px -1634px;
width: 81px;
height: 99px;
}
.Pet-BearCub-Zombie {
.Mount_Icon_BearCub-Zombie {
background-image: url(spritesmith-main-8.png);
background-position: -492px -1634px;
width: 81px;
height: 99px;
}
.Pet-Bunny-Base {
.Mount_Icon_Bunny-Base {
background-image: url(spritesmith-main-8.png);
background-position: -1634px -1060px;
width: 81px;

Binary file not shown.

Before

Width:  |  Height:  |  Size: 139 KiB

After

Width:  |  Height:  |  Size: 138 KiB

File diff suppressed because it is too large Load diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 159 KiB

After

Width:  |  Height:  |  Size: 150 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 673 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 676 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 667 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 661 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 695 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 677 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 633 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 717 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 632 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 770 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 824 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 819 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 783 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 796 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 773 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 765 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 781 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 741 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 786 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 767 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 823 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 812 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 812 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 785 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 809 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 820 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 784 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 577 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 809 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1,000 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 863 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 851 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1,002 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1,023 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 921 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 740 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 704 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 725 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 736 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 730 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 727 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 684 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 709 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 668 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 705 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 646 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 648 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 655 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 644 B

Some files were not shown because too many files have changed in this diff Show more