Alice Harris ab66f95c8e Merge remote-tracking branch 'upstream/develop' into rebalancing-2014-12 ...

Conflicts:
	dist/habitrpg-shared.js

2015-01-06 15:26:59 +10: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 rebalancing-2014-12

2015-01-06 15:26:59 +10: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