Tyler Renelle f8f8a1334b Merge branch 'develop' into classes ...

Conflicts:
	views/options/inventory/stable.jade

2013-12-07 20:23:26 -07:00

..

achievements.jade

classes & grunt-spritesmith: NPCs habitrpg-shared#85164c9

2013-12-04 16:52:06 -07:00

buy-gems.jade

classes & grunt-spritesmith: NPCs habitrpg-shared#85164c9

2013-12-04 16:52:06 -07:00

classes.jade

classes: proper handling of items on class-switch, un-equipping items,

2013-12-06 15:41:58 -07:00

death.jade

classes & grunt-spritesmith: death, paws, gems-cleanup

2013-12-04 16:02:08 -07:00

index.jade

classes WIP

2013-11-23 16:59:41 -07:00

login.jade

rewrite: push login modal to the front page, don't allow anonymous

2013-09-02 01:08:28 -04:00

members.jade

removed comments from testing.

2013-11-23 11:14:16 -08:00

new-stuff.jade

Merge branch 'develop' into classes

2013-12-07 20:23:26 -07:00

pets.jade

mounts: update all html & javascript to support UserSchema overhaul (60421a8). Also add very basic feeding & saddling mounts functionality. use progress bars to indicate pet feeding progress

2013-11-10 11:04:41 -08:00

reroll.jade

paypal: conslidate buy gems modals

2013-10-12 16:51:01 -07:00

settings.jade

classes: armory WIP

2013-11-30 16:33:21 -07:00