Sabe Jones 27e3797307 Merge branch 'develop' into sabrecat/more-modals ...

Conflicts:
	common/locales/en/challenge.json

2015-10-28 14:54:55 -04:00

..

archive

Mv images to correct place

2015-02-12 13:44:28 -06:00

backer-only

Mv images to correct place

2015-02-12 13:44:28 -06:00

pet-hatching

Mv images to correct place

2015-02-12 13:44:28 -06:00

spritesmith

Merge branch 'develop' into sabrecat/more-modals

2015-10-28 14:54:55 -04:00

spritesmith_large

fix(sprites): Flip goblin tail

2015-10-23 16:33:58 -04:00

npc_ian.gif

Mv images to correct place

2015-02-12 13:44:28 -06:00

quest_burnout.gif

WIP(world-boss): Initial stats outlay

2015-10-05 16:59:19 -04:00