Tyler Renelle 7147287164 chore(Merge): remote-tracking branch 'PeterHatch/develop' into develop ...

Conflicts:
	dist/customizer.css
	dist/habitrpg-shared.css
	dist/habitrpg-shared.js
	dist/spritesmith.css
	dist/spritesmith.png

2014-03-21 20:07:19 -06:00

..

archive

grunt-spritesmith #37 contributor pet

2013-12-05 15:56:47 -07:00

backer-only

feat(critical-hammer): add Critical Hammer of Bug-Crushing

2014-02-07 11:48:06 -07:00

pet-hatching

Archives unused sprite sheets to keep things cleaner and less confusing.

2013-11-08 00:01:05 -08:00

spritesmith

chore(Merge): remote-tracking branch 'PeterHatch/develop' into develop

2014-03-21 20:07:19 -06:00

npc_ian.gif

Quests: Initial bosses WIP, change all content.*.name to content.*.key for consistency (and to make room for quest.name). Bugfix on STR adjustment

2013-12-22 22:20:44 -07:00