Tyler Renelle 4c3f04cc49 Merge branch 'mounts' into develop ...

Conflicts:
	views/options/inventory/stable.jade

2013-11-14 13:04:44 -08:00

..

achievements.jade

contrib: links to wikia in tavern & popup

2013-11-08 19:28:07 -08:00

buy-gems.jade

typo in donate page

2013-10-22 20:55:55 -07:00

death.jade

[#1693] make revive available to /options too

2013-10-31 09:34:12 -07:00

index.jade

paypal: conslidate buy gems modals

2013-10-12 16:51:01 -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

remove broken website field from profile

2013-11-12 17:31:10 +11:00

new-stuff.jade

replace github contributing links → wikia link

2013-11-14 15:09:20 +11: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

[#1766] remove "trigger next day" option

2013-11-08 13:54:29 -08:00