Blade Barringer 75cf2a4788 Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into mountmaster ...

Conflicts:
	dist/habitrpg-shared.css
	dist/habitrpg-shared.js
	dist/spritesmith0.css
	dist/spritesmith0.png

2015-01-16 10:46:59 -06:00

..

achievements

Merged in changes from develop and re-ran grunt full

2015-01-10 09:33:52 -06:00

backgrounds

fix(backgrounds): Frigid, not Snowy, Peak

2015-01-05 16:41:23 -06:00

customize

feat(NYE): Image resources

2014-12-29 20:17:47 -06:00

gear

Merge pull request #425 from SabreCat/nye

2014-12-30 22:17:23 -06:00

misc

chore(January): Jan updates

2015-01-01 23:18:18 -06:00

npcs

feat(event): World Boss

2015-01-08 15:24:26 -06:00

promo

feat(NYE): Image resources

2014-12-29 20:17:47 -06:00

quests

feat(quest): T-Rex pet

2015-01-15 15:45:56 -06:00

shop

Adjusted position of ghost and snowball

2014-12-31 09:14:29 -06:00

stable

feat(quest): T-Rex pet

2015-01-15 15:45:56 -06:00