Sabe Jones 41b4d497f7 Merge branch 'develop' into sabrecat/pet-201509 ...

Conflicts:
	common/dist/sprites/habitrpg-shared.css
	common/dist/sprites/spritesmith2.css
	common/dist/sprites/spritesmith2.png
	common/dist/sprites/spritesmith3.css
	common/dist/sprites/spritesmith3.png
	common/dist/sprites/spritesmith4.css
	common/dist/sprites/spritesmith4.png

2015-09-08 13:25:10 -05:00

..

achievements

WIP(greeting-cards): Abandon spell refactor

2015-08-13 14:31:34 -05:00

backgrounds

chore(content): Compile sprites

2015-08-31 15:54:08 -05:00

customize

feat(events): Limited edition

2015-06-25 11:19:01 -05:00

gear

chore(content): Compile sprites

2015-08-31 15:54:08 -05:00

misc

Merge branch 'develop' into sabrecat/party-page

2015-08-28 23:06:00 -05:00

npcs

fix(NPCs): De-Splashify sprites

2015-08-04 14:39:29 -05:00

promo

chore(content): Compile sprites

2015-08-31 15:54:08 -05:00

quests

feat(pets): Horse sprites

2015-09-01 12:07:21 -05:00

shop

Resize sea foam image

2015-07-15 07:53:12 -05:00

stable

feat(pets): Horse sprites

2015-09-01 12:07:21 -05:00