Merge pull request #325 from lemoness/develop

Browse source

Fall Festival 2014 Skins and Hair Colors

...

This commit is contained in:

Tyler Renelle 2014-09-30 19:28:27 -06:00

parent 7d22fb0944 23a57ac9ad

commit 2f937b6340

112 changed files with 0 additions and 0 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files

BIN

img/sprites/spritesmith/customize/beards/hair_beard_1_candycorn.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.9 KiB

BIN

img/sprites/spritesmith/customize/beards/hair_beard_1_ghostwhite.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.9 KiB

BIN

img/sprites/spritesmith/customize/beards/hair_beard_1_halloween.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.9 KiB

BIN

img/sprites/spritesmith/customize/beards/hair_beard_1_midnight.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.9 KiB

BIN

img/sprites/spritesmith/customize/beards/hair_beard_1_pumpkin.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.9 KiB

BIN

img/sprites/spritesmith/customize/beards/hair_beard_1_zombie.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.9 KiB

BIN

img/sprites/spritesmith/customize/beards/hair_beard_2_candycorn.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3 KiB

BIN

img/sprites/spritesmith/customize/beards/hair_beard_2_ghostwhite.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.9 KiB

BIN

img/sprites/spritesmith/customize/beards/hair_beard_2_halloween.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.9 KiB

BIN

img/sprites/spritesmith/customize/beards/hair_beard_2_midnight.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3 KiB

BIN

img/sprites/spritesmith/customize/beards/hair_beard_2_pumpkin.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.9 KiB

BIN

img/sprites/spritesmith/customize/beards/hair_beard_2_zombie.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3 KiB

BIN

img/sprites/spritesmith/customize/beards/hair_beard_3_candycorn.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3 KiB

BIN

img/sprites/spritesmith/customize/beards/hair_beard_3_ghostwhite.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3 KiB

BIN

img/sprites/spritesmith/customize/beards/hair_beard_3_halloween.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3 KiB

BIN

img/sprites/spritesmith/customize/beards/hair_beard_3_midnight.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3 KiB

BIN

img/sprites/spritesmith/customize/beards/hair_beard_3_pumpkin.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3 KiB

BIN

img/sprites/spritesmith/customize/beards/hair_beard_3_zombie.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.1 KiB

BIN

img/sprites/spritesmith/customize/beards/hair_mustache_1_candycorn.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.9 KiB

BIN

img/sprites/spritesmith/customize/beards/hair_mustache_1_ghostwhite.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.9 KiB

BIN

img/sprites/spritesmith/customize/beards/hair_mustache_1_halloween.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.9 KiB

BIN

img/sprites/spritesmith/customize/beards/hair_mustache_1_midnight.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.9 KiB

BIN

img/sprites/spritesmith/customize/beards/hair_mustache_1_pumpkin.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.9 KiB

BIN

img/sprites/spritesmith/customize/beards/hair_mustache_1_zombie.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.9 KiB

BIN

img/sprites/spritesmith/customize/beards/hair_mustache_2_candycorn.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.9 KiB

BIN

img/sprites/spritesmith/customize/beards/hair_mustache_2_ghostwhite.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.9 KiB

BIN

img/sprites/spritesmith/customize/beards/hair_mustache_2_halloween.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.9 KiB

BIN

img/sprites/spritesmith/customize/beards/hair_mustache_2_midnight.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.9 KiB

BIN

img/sprites/spritesmith/customize/beards/hair_mustache_2_pumpkin.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.9 KiB

BIN

img/sprites/spritesmith/customize/beards/hair_mustache_2_zombie.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3 KiB

BIN

img/sprites/spritesmith/customize/hair/hair_bangs_1_candycorn.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.1 KiB

BIN

img/sprites/spritesmith/customize/hair/hair_bangs_1_ghostwhite.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.1 KiB

BIN

img/sprites/spritesmith/customize/hair/hair_bangs_1_halloween.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.1 KiB

BIN

img/sprites/spritesmith/customize/hair/hair_bangs_1_midnight.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.1 KiB

BIN

img/sprites/spritesmith/customize/hair/hair_bangs_1_pumpkin.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.1 KiB

BIN

img/sprites/spritesmith/customize/hair/hair_bangs_1_zombie.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.2 KiB

BIN

img/sprites/spritesmith/customize/hair/hair_bangs_2_candycorn.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.1 KiB

BIN

img/sprites/spritesmith/customize/hair/hair_bangs_2_ghostwhite.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.1 KiB

BIN

img/sprites/spritesmith/customize/hair/hair_bangs_2_halloween.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.1 KiB

BIN

img/sprites/spritesmith/customize/hair/hair_bangs_2_midnight.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.1 KiB

BIN

img/sprites/spritesmith/customize/hair/hair_bangs_2_pumpkin.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.1 KiB

BIN

img/sprites/spritesmith/customize/hair/hair_bangs_2_zombie.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.2 KiB

BIN

img/sprites/spritesmith/customize/hair/hair_bangs_3_candycorn.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.1 KiB

BIN

img/sprites/spritesmith/customize/hair/hair_bangs_3_ghostwhite.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.1 KiB

BIN

img/sprites/spritesmith/customize/hair/hair_bangs_3_halloween.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.1 KiB

BIN

img/sprites/spritesmith/customize/hair/hair_bangs_3_midnight.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.1 KiB

BIN

img/sprites/spritesmith/customize/hair/hair_bangs_3_pumpkin.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.1 KiB

BIN

img/sprites/spritesmith/customize/hair/hair_bangs_3_zombie.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.2 KiB

BIN

img/sprites/spritesmith/customize/hair/hair_base_1_candycorn.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3 KiB

BIN

img/sprites/spritesmith/customize/hair/hair_base_1_ghostwhite.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3 KiB

BIN

img/sprites/spritesmith/customize/hair/hair_base_1_halloween.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3 KiB

BIN

img/sprites/spritesmith/customize/hair/hair_base_1_midnight.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3 KiB

BIN

img/sprites/spritesmith/customize/hair/hair_base_1_pumpkin.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3 KiB

BIN

img/sprites/spritesmith/customize/hair/hair_base_1_zombie.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.1 KiB

BIN

img/sprites/spritesmith/customize/hair/hair_base_2_candycorn.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3 KiB

BIN

img/sprites/spritesmith/customize/hair/hair_base_2_ghostwhite.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.1 KiB

BIN

img/sprites/spritesmith/customize/hair/hair_base_2_halloween.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3 KiB

BIN

img/sprites/spritesmith/customize/hair/hair_base_2_midnight.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3 KiB

BIN

img/sprites/spritesmith/customize/hair/hair_base_2_pumpkin.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3 KiB

BIN

img/sprites/spritesmith/customize/hair/hair_base_2_zombie.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.1 KiB

BIN

img/sprites/spritesmith/customize/hair/hair_base_3_candycorn.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3 KiB

BIN

img/sprites/spritesmith/customize/hair/hair_base_3_ghostwhite.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.1 KiB

BIN

img/sprites/spritesmith/customize/hair/hair_base_3_halloween.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3 KiB

BIN

img/sprites/spritesmith/customize/hair/hair_base_3_midnight.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3 KiB

BIN

img/sprites/spritesmith/customize/hair/hair_base_3_pumpkin.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3 KiB

BIN

img/sprites/spritesmith/customize/hair/hair_base_3_zombie.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.1 KiB

BIN

img/sprites/spritesmith/customize/hair/hair_base_4_candycorn.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.1 KiB

BIN

img/sprites/spritesmith/customize/hair/hair_base_4_ghostwhite.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.1 KiB

BIN

img/sprites/spritesmith/customize/hair/hair_base_4_halloween.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.1 KiB

BIN

img/sprites/spritesmith/customize/hair/hair_base_4_midnight.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.1 KiB

BIN

img/sprites/spritesmith/customize/hair/hair_base_4_pumpkin.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3 KiB

BIN

img/sprites/spritesmith/customize/hair/hair_base_4_zombie.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.2 KiB

BIN

img/sprites/spritesmith/customize/hair/hair_base_5_candycorn.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.1 KiB

BIN

img/sprites/spritesmith/customize/hair/hair_base_5_ghostwhite.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.1 KiB

BIN

img/sprites/spritesmith/customize/hair/hair_base_5_halloween.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.1 KiB

BIN

img/sprites/spritesmith/customize/hair/hair_base_5_midnight.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.1 KiB

BIN

img/sprites/spritesmith/customize/hair/hair_base_5_pumpkin.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.1 KiB

BIN

img/sprites/spritesmith/customize/hair/hair_base_5_zombie.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.2 KiB

BIN

img/sprites/spritesmith/customize/hair/hair_base_6_candycorn.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3 KiB

BIN

img/sprites/spritesmith/customize/hair/hair_base_6_ghostwhite.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3 KiB

BIN

img/sprites/spritesmith/customize/hair/hair_base_6_halloween.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3 KiB

BIN

img/sprites/spritesmith/customize/hair/hair_base_6_midnight.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3 KiB

BIN

img/sprites/spritesmith/customize/hair/hair_base_6_pumpkin.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3 KiB

BIN

img/sprites/spritesmith/customize/hair/hair_base_6_zombie.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.1 KiB

BIN

img/sprites/spritesmith/customize/hair/hair_base_7_candycorn.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3 KiB

BIN

img/sprites/spritesmith/customize/hair/hair_base_7_ghostwhite.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3 KiB

BIN

img/sprites/spritesmith/customize/hair/hair_base_7_halloween.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3 KiB

BIN

img/sprites/spritesmith/customize/hair/hair_base_7_midnight.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3 KiB

BIN

img/sprites/spritesmith/customize/hair/hair_base_7_pumpkin.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3 KiB

BIN

img/sprites/spritesmith/customize/hair/hair_base_7_zombie.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.1 KiB

BIN

img/sprites/spritesmith/customize/hair/hair_base_8_candycorn.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3 KiB

BIN

img/sprites/spritesmith/customize/hair/hair_base_8_ghostwhite.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3 KiB

BIN

img/sprites/spritesmith/customize/hair/hair_base_8_halloween.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3 KiB

BIN

img/sprites/spritesmith/customize/hair/hair_base_8_midnight.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3 KiB

BIN

img/sprites/spritesmith/customize/hair/hair_base_8_pumpkin.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3 KiB

BIN

img/sprites/spritesmith/customize/hair/hair_base_8_zombie.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3 KiB

BIN

img/sprites/spritesmith/customize/skin/skin_candycorn.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.9 KiB

BIN

img/sprites/spritesmith/customize/skin/skin_candycorn_sleep.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.9 KiB

BIN

img/sprites/spritesmith/customize/skin/skin_ogre.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 4 KiB

BIN

img/sprites/spritesmith/customize/skin/skin_ogre_sleep.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 4 KiB

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