Sabe Jones d022a0eb67 Merge branch 'develop' into sabrecat/death-modal ...

Conflicts:
	common/dist/sprites/habitrpg-shared.css
	common/dist/sprites/spritesmith0.png
	common/dist/sprites/spritesmith2.png
	common/dist/sprites/spritesmith3.css
	common/dist/sprites/spritesmith3.png
	common/dist/sprites/spritesmith4.css
	common/dist/sprites/spritesmith4.png

2015-07-24 16:11:51 -05:00

..

main

Adjust PR #5389

2015-06-12 09:05:06 -05:00

options

Refactor inventory ctrl variables

2015-07-20 12:51:10 -05:00

shared

Merge branch 'develop' into sabrecat/death-modal

2015-07-24 16:11:51 -05:00

static

Change motivate message

2015-07-03 19:13:31 -05:00

avatar-static.jade

Refactored avatar

2015-06-27 16:08:38 -05:00

index.jade

Deselect food, egg, and potion when hitting the escape key

2015-07-21 21:52:29 -05:00