Merge pull request #4939 from SabreCat/spring-customize

Browse source

Spring customizations

...

This commit is contained in:

Sabe Jones 2015-03-29 16:52:09 -05:00

parent 40bd38af53 15c72b2ea8

commit 7d9728f2ff

166 changed files with 8777 additions and 6948 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

2

common/dist/sprites/habitrpg-shared.css vendored

View file

File diff suppressed because one or more lines are too long

954

common/dist/sprites/spritesmith0.css vendored

View file

File diff suppressed because it is too large Load diff

BIN

common/dist/sprites/spritesmith0.png vendored

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 250 KiB After Width:  |  Height:  |  Size: 256 KiB

6122

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: 79 KiB After Width:  |  Height:  |  Size: 86 KiB

5008

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: 193 KiB After Width:  |  Height:  |  Size: 184 KiB

1464

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: 509 KiB After Width:  |  Height:  |  Size: 275 KiB

1196

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: 352 KiB After Width:  |  Height:  |  Size: 600 KiB

922

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: 301 KiB After Width:  |  Height:  |  Size: 317 KiB

BIN

common/img/sprites/spritesmith/customize/hair/hair_bangs_1_pblue2.png Normal file

View file

Binary file not shown.

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

BIN

common/img/sprites/spritesmith/customize/hair/hair_bangs_1_pgreen2.png Normal file

View file

Binary file not shown.

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

BIN

common/img/sprites/spritesmith/customize/hair/hair_bangs_1_porange2.png Normal file

View file

Binary file not shown.

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

BIN

common/img/sprites/spritesmith/customize/hair/hair_bangs_1_ppink2.png Normal file

View file

Binary file not shown.

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

BIN

common/img/sprites/spritesmith/customize/hair/hair_bangs_1_ppurple2.png Normal file

View file

Binary file not shown.

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

BIN

common/img/sprites/spritesmith/customize/hair/hair_bangs_1_pyellow2.png Normal file

View file

Binary file not shown.

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

BIN

common/img/sprites/spritesmith/customize/hair/hair_bangs_2_pblue2.png Normal 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_bangs_2_pgreen2.png Normal file

View file

Binary file not shown.

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

BIN

common/img/sprites/spritesmith/customize/hair/hair_bangs_2_porange2.png Normal 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_bangs_2_ppink2.png Normal 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_bangs_2_ppurple2.png Normal file

View file

Binary file not shown.

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

BIN

common/img/sprites/spritesmith/customize/hair/hair_bangs_2_pyellow2.png Normal 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_bangs_3_pblue2.png Normal 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_bangs_3_pgreen2.png Normal 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_bangs_3_porange2.png Normal 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_bangs_3_ppink2.png Normal 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_bangs_3_ppurple2.png Normal 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_bangs_3_pyellow2.png Normal 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_10_pblue2.png Normal file

View file

Binary file not shown.

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

BIN

common/img/sprites/spritesmith/customize/hair/hair_base_10_pgreen2.png Normal file

View file

Binary file not shown.

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

BIN

common/img/sprites/spritesmith/customize/hair/hair_base_10_porange2.png Normal file

View file

Binary file not shown.

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

BIN

common/img/sprites/spritesmith/customize/hair/hair_base_10_ppink2.png Normal file

View file

Binary file not shown.

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

BIN

common/img/sprites/spritesmith/customize/hair/hair_base_10_ppurple2.png Normal file

View file

Binary file not shown.

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

BIN

common/img/sprites/spritesmith/customize/hair/hair_base_10_pyellow2.png Normal file

View file

Binary file not shown.

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

BIN

common/img/sprites/spritesmith/customize/hair/hair_base_11_pblue2.png Normal file

View file

Binary file not shown.

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

BIN

common/img/sprites/spritesmith/customize/hair/hair_base_11_pgreen2.png Normal file

View file

Binary file not shown.

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

BIN

common/img/sprites/spritesmith/customize/hair/hair_base_11_porange2.png Normal file

View file

Binary file not shown.

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

BIN

common/img/sprites/spritesmith/customize/hair/hair_base_11_ppink2.png Normal file

View file

Binary file not shown.

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

BIN

common/img/sprites/spritesmith/customize/hair/hair_base_11_ppurple2.png Normal file

View file

Binary file not shown.

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

BIN

common/img/sprites/spritesmith/customize/hair/hair_base_11_pyellow2.png Normal file

View file

Binary file not shown.

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

BIN

common/img/sprites/spritesmith/customize/hair/hair_base_12_pblue2.png Normal file

View file

Binary file not shown.

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

BIN

common/img/sprites/spritesmith/customize/hair/hair_base_12_pgreen2.png Normal file

View file

Binary file not shown.

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

BIN

common/img/sprites/spritesmith/customize/hair/hair_base_12_porange2.png Normal file

View file

Binary file not shown.

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

BIN

common/img/sprites/spritesmith/customize/hair/hair_base_12_ppink2.png Normal file

View file

Binary file not shown.

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

BIN

common/img/sprites/spritesmith/customize/hair/hair_base_12_ppurple2.png Normal file

View file

Binary file not shown.

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

BIN

common/img/sprites/spritesmith/customize/hair/hair_base_12_pyellow2.png Normal file

View file

Binary file not shown.

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

BIN

common/img/sprites/spritesmith/customize/hair/hair_base_13_pblue2.png Normal file

View file

Binary file not shown.

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

BIN

common/img/sprites/spritesmith/customize/hair/hair_base_13_pgreen2.png Normal 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_porange2.png Normal 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_ppink2.png Normal 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_ppurple2.png Normal 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_pyellow2.png Normal 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_pblue2.png Normal file

View file

Binary file not shown.

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

BIN

common/img/sprites/spritesmith/customize/hair/hair_base_14_pgreen2.png Normal file

View file

Binary file not shown.

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

BIN

common/img/sprites/spritesmith/customize/hair/hair_base_14_porange2.png Normal file

View file

Binary file not shown.

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

BIN

common/img/sprites/spritesmith/customize/hair/hair_base_14_ppink2.png Normal file

View file

Binary file not shown.

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

BIN

common/img/sprites/spritesmith/customize/hair/hair_base_14_ppurple2.png Normal file

View file

Binary file not shown.

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

BIN

common/img/sprites/spritesmith/customize/hair/hair_base_14_pyellow2.png Normal file

View file

Binary file not shown.

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

BIN

common/img/sprites/spritesmith/customize/hair/hair_base_1_pblue2.png Normal 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_1_pgreen2.png Normal 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_1_porange2.png Normal 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_1_ppink2.png Normal 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_1_ppurple2.png Normal 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_1_pyellow2.png Normal 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_2_pblue2.png Normal 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_2_pgreen2.png Normal 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_2_porange2.png Normal 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_2_ppink2.png Normal 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_2_ppurple2.png Normal 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_2_pyellow2.png Normal 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_3_pblue2.png Normal 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_3_pgreen2.png Normal 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_3_porange2.png Normal 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_3_ppink2.png Normal 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_3_ppurple2.png Normal 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_3_pyellow2.png Normal 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_4_pblue2.png Normal file

View file

Binary file not shown.

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

BIN

common/img/sprites/spritesmith/customize/hair/hair_base_4_pgreen2.png Normal 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_4_porange2.png Normal 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_4_ppink2.png Normal 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_4_ppurple2.png Normal 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_4_pyellow2.png Normal 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_5_pblue2.png Normal file

View file

Binary file not shown.

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

BIN

common/img/sprites/spritesmith/customize/hair/hair_base_5_pgreen2.png Normal file

View file

Binary file not shown.

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

BIN

common/img/sprites/spritesmith/customize/hair/hair_base_5_porange2.png Normal file

View file

Binary file not shown.

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

BIN

common/img/sprites/spritesmith/customize/hair/hair_base_5_ppink2.png Normal file

View file

Binary file not shown.

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

BIN

common/img/sprites/spritesmith/customize/hair/hair_base_5_ppurple2.png Normal file

View file

Binary file not shown.

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

BIN

common/img/sprites/spritesmith/customize/hair/hair_base_5_pyellow2.png Normal file

View file

Binary file not shown.

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

BIN

common/img/sprites/spritesmith/customize/hair/hair_base_6_pblue2.png Normal 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_6_pgreen2.png Normal 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_6_porange2.png Normal 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_6_ppink2.png Normal 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_6_ppurple2.png Normal 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_6_pyellow2.png Normal file

View file

Binary file not shown.

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

BIN

common/img/sprites/spritesmith/customize/hair/hair_base_7_pblue2.png Normal 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_7_pgreen2.png Normal 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_7_porange2.png Normal file

View file

Binary file not shown.

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

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