Merge branch 'fix_gryphons' of https://github.com/taldin/habitrpg into taldin-fix_gryphons

Browse source

Conflicts:
	common/dist/sprites/spritesmith-main-5.css
	common/dist/sprites/spritesmith-main-5.png

...

This commit is contained in:

Alys 2016-02-18 18:56:40 +10:00

parent f631712a45 b293d7acc2

commit 8d106d6d78

36 changed files with 265 additions and 265 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

common/dist/sprites/spritesmith-largeSprites-0.png vendored

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 222 KiB After Width:  |  Height:  |  Size: 319 KiB

BIN

common/dist/sprites/spritesmith-main-0.png vendored

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 286 KiB After Width:  |  Height:  |  Size: 421 KiB

BIN

common/dist/sprites/spritesmith-main-1.png vendored

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 60 KiB After Width:  |  Height:  |  Size: 87 KiB

BIN

common/dist/sprites/spritesmith-main-10.png vendored

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 147 KiB After Width:  |  Height:  |  Size: 232 KiB

BIN

common/dist/sprites/spritesmith-main-11.png vendored

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 133 KiB After Width:  |  Height:  |  Size: 222 KiB

BIN

common/dist/sprites/spritesmith-main-2.png vendored

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 31 KiB After Width:  |  Height:  |  Size: 96 KiB

BIN

common/dist/sprites/spritesmith-main-3.png vendored

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 137 KiB After Width:  |  Height:  |  Size: 191 KiB

BIN

common/dist/sprites/spritesmith-main-4.png vendored

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 130 KiB After Width:  |  Height:  |  Size: 199 KiB

530

common/dist/sprites/spritesmith-main-5.css vendored

View file

File diff suppressed because it is too large Load diff

BIN

common/dist/sprites/spritesmith-main-5.png vendored

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 329 KiB After Width:  |  Height:  |  Size: 494 KiB

BIN

common/dist/sprites/spritesmith-main-6.png vendored

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 209 KiB After Width:  |  Height:  |  Size: 316 KiB

BIN

common/dist/sprites/spritesmith-main-7.png vendored

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 135 KiB After Width:  |  Height:  |  Size: 206 KiB

BIN

common/dist/sprites/spritesmith-main-8.png vendored

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 153 KiB After Width:  |  Height:  |  Size: 238 KiB

BIN

common/dist/sprites/spritesmith-main-9.png vendored

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 143 KiB After Width:  |  Height:  |  Size: 222 KiB

BIN

common/img/sprites/spritesmith/stable/mounts/Mount_Body_Gryphon-Base.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 1 KiB After Width:  |  Height:  |  Size: 750 B

BIN

common/img/sprites/spritesmith/stable/mounts/Mount_Body_Gryphon-CottonCandyBlue.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 953 B After Width:  |  Height:  |  Size: 701 B

BIN

common/img/sprites/spritesmith/stable/mounts/Mount_Body_Gryphon-CottonCandyPink.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 938 B After Width:  |  Height:  |  Size: 694 B

BIN

common/img/sprites/spritesmith/stable/mounts/Mount_Body_Gryphon-Desert.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 1,021 B After Width:  |  Height:  |  Size: 737 B

BIN

common/img/sprites/spritesmith/stable/mounts/Mount_Body_Gryphon-Golden.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 1 KiB After Width:  |  Height:  |  Size: 780 B

BIN

common/img/sprites/spritesmith/stable/mounts/Mount_Body_Gryphon-Red.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 988 B After Width:  |  Height:  |  Size: 716 B

BIN

common/img/sprites/spritesmith/stable/mounts/Mount_Body_Gryphon-RoyalPurple.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 3.7 KiB After Width:  |  Height:  |  Size: 803 B

BIN

common/img/sprites/spritesmith/stable/mounts/Mount_Body_Gryphon-Shade.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 860 B After Width:  |  Height:  |  Size: 608 B

BIN

common/img/sprites/spritesmith/stable/mounts/Mount_Body_Gryphon-Skeleton.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 862 B After Width:  |  Height:  |  Size: 652 B

BIN

common/img/sprites/spritesmith/stable/mounts/Mount_Body_Gryphon-White.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 1,014 B After Width:  |  Height:  |  Size: 755 B

BIN

common/img/sprites/spritesmith/stable/mounts/Mount_Body_Gryphon-Zombie.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 943 B After Width:  |  Height:  |  Size: 674 B

BIN

common/img/sprites/spritesmith/stable/mounts/Mount_Head_Gryphon-Base.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 773 B After Width:  |  Height:  |  Size: 1 KiB

BIN

common/img/sprites/spritesmith/stable/mounts/Mount_Head_Gryphon-CottonCandyBlue.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 774 B After Width:  |  Height:  |  Size: 1 KiB

BIN

common/img/sprites/spritesmith/stable/mounts/Mount_Head_Gryphon-CottonCandyPink.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 762 B After Width:  |  Height:  |  Size: 1,020 B

BIN

common/img/sprites/spritesmith/stable/mounts/Mount_Head_Gryphon-Desert.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 771 B After Width:  |  Height:  |  Size: 1 KiB

BIN

common/img/sprites/spritesmith/stable/mounts/Mount_Head_Gryphon-Golden.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 873 B After Width:  |  Height:  |  Size: 1.1 KiB

BIN

common/img/sprites/spritesmith/stable/mounts/Mount_Head_Gryphon-Red.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 740 B After Width:  |  Height:  |  Size: 1,012 B

BIN

common/img/sprites/spritesmith/stable/mounts/Mount_Head_Gryphon-RoyalPurple.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 3.5 KiB After Width:  |  Height:  |  Size: 1.1 KiB

BIN

common/img/sprites/spritesmith/stable/mounts/Mount_Head_Gryphon-Shade.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 707 B After Width:  |  Height:  |  Size: 941 B

BIN

common/img/sprites/spritesmith/stable/mounts/Mount_Head_Gryphon-Skeleton.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 596 B After Width:  |  Height:  |  Size: 889 B

BIN

common/img/sprites/spritesmith/stable/mounts/Mount_Head_Gryphon-White.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 847 B After Width:  |  Height:  |  Size: 1.1 KiB

BIN

common/img/sprites/spritesmith/stable/mounts/Mount_Head_Gryphon-Zombie.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 831 B After Width:  |  Height:  |  Size: 1.1 KiB