Blade Barringer 8f90d154a0 Merge remote-tracking branch 'upstream/develop' into mountmaster ...

Conflicts:
	dist/habitrpg-shared.css
	dist/spritesmith0.css
	dist/spritesmith0.png
	dist/spritesmith1.css
	dist/spritesmith1.png
	dist/spritesmith2.css
	dist/spritesmith2.png
	dist/spritesmith3.css
	dist/spritesmith3.png

2015-01-08 11:30:53 -06:00

..

archive

grunt-spritesmith #37 contributor pet

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

backer-only

Updated crystal armor

2014-12-29 22:51:06 -06:00

pet-hatching

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

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

spritesmith

Merge remote-tracking branch 'upstream/develop' into mountmaster

2015-01-08 11:30:53 -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