Sabe Jones beb86ea4bd Merge branch 'khipkin/party-badges' into develop ...

Conflicts:
	common/dist/sprites/spritesmith-main-10.png
	common/dist/sprites/spritesmith-main-11.png
	common/dist/sprites/spritesmith-main-5.css
	common/dist/sprites/spritesmith-main-5.png
	common/dist/sprites/spritesmith-main-6.png
	common/dist/sprites/spritesmith-main-7.png
	common/dist/sprites/spritesmith-main-8.png
	common/dist/sprites/spritesmith-main-9.png

2016-03-15 14:57:38 -04:00

..

achievements

fix blurry upscale of achievement-partyUp img

2016-03-10 20:49:54 -05:00

backgrounds

feat(content): Armoire and BGs 2016-03

2016-03-01 15:59:25 -05:00

customize

chore(news): Bailey 2016-01-08

2016-01-08 16:28:49 -05:00

gear

feat(content): Armoire and BGs 2016-03

2016-03-01 15:59:25 -05:00

misc

feat(event): Habit Birthday 2016

2016-01-28 17:16:01 -05:00

npcs

fix(events): revert missed sprite and quest availability

2016-02-24 19:49:17 -05:00

quests

feat(content): snail pet quest WIP

2016-03-09 15:34:57 -05:00

shop

Resize sea foam image

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

stable

feat(content): snails complete

2016-03-09 15:55:22 -05:00