Commit Graph

26 Commits

Author SHA1 Message Date
Sabe Jones 2cb4e80019 chore(event): End Fall Festival 2015-11-02 12:55:48 -05:00
Sabe Jones 009c92b532 feat(content): September sub items and customizations 2015-09-23 15:23:42 -04:00
Blade Barringer ee0bcb5309 Correct class name 2015-08-30 17:52:16 -05:00
Blade Barringer 4af1a4d6ac Rename image rendering class 2015-08-28 21:48:42 -05:00
Blade Barringer df3c498fcc Add rasterize class 2015-08-28 21:41:53 -05:00
Sabe Jones 68cc0fd56a fix(avatar): Delist Splashy Skins
Also removes a style that was causing hair colors to be the only 40x40 buttons on a page full of 60x60 buttons.
2015-08-04 15:17:38 -05:00
Blade Barringer 6ac049cc71 Allow animal ears to be added to costume or equipped gear 2015-07-12 09:23:03 -05:00
Alys 92bfc66c67 fix a bug where if you had "Use Costume" ticked, any Battle Gear or Costume choice would be added to your costume, never to Battle Gear 2015-07-12 18:18:31 +10:00
Blade Barringer b71f68ef32 Merge branch 'develop' into equipment-refactor-merge-into-develop 2015-07-11 15:55:53 -05:00
Blade Barringer dccc10aa4d Refactor 2015-07-11 15:05:58 -05:00
Sabe Jones 775f903c3d feat(events): Limited edition
Summer Splash skins and June mystery item. Also announces the Gokul sound theme.
2015-06-25 11:19:01 -05:00
GihHubSphinx 04d5f2f59e Additional translatable line for blurb placeholder
A new commit to replace https://github.com/HabitRPG/habitrpg/pull/5293
which turned messy after I rebased accidentally

New screenshot: http://i.snag.gy/m9gTA.jpg
2015-05-31 23:41:12 +05:00
hairlessbear 958068c2b0 Rebased to resolve merge conflicts 2015-05-26 00:19:35 -04:00
hairlessbear b912dcaf6a Added selectableInventory logic to animal ears 2015-05-17 22:01:54 -04:00
hairlessbear 9c205e600a Merge branch 'avatar_indicate_equipped' of https://github.com/hairlessbear/habitrpg into develop 2015-05-17 17:19:17 -04:00
hairlessbear 456dd37f41 Added selectableInventory to two buttons I missed the first time 2015-05-17 16:51:59 -04:00
hairlessbear c47c555a21 Added indication of currently equipped preferences to avatar customization page 2015-05-17 16:30:22 -04:00
Blade Barringer da20a493c6 Merge branch 'hairlessbear-level_100_attribute_message' into develop 2015-05-16 22:50:57 -05:00
Blade Barringer 9017ba7d7e Hide attribute points counter if you're over 100 and have 0 left 2015-05-16 17:08:06 -05:00
hairlessbear 52d869b195 Fixed issue #5203 2015-05-16 16:52:58 -04:00
Sabe Jones 29109051d7 feat(customize): Animal skins and ears
Implements a base-pet-themed set of avatar skins and head accessories, the latter of which has additional handling for the user to purchase them from the Avatar Customization page.
2015-05-13 11:19:08 -05:00
Sabe Jones d50d4ad8bb feat(Spring): Flung 2015-05-01 19:09:28 -05:00
Sabe Jones 9722af679d feat(customize): Spring Colors 2015-03-28 16:22:52 -05:00
Blade Barringer 477d3d6085 Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert 2015-02-12 13:32:23 -06:00
Blade Barringer cc767efa20 Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert
Conflicts:
	src/controllers/auth.js
	src/controllers/challenges.js
	src/controllers/groups.js
	src/controllers/members.js
	src/controllers/payments/index.js
	src/controllers/user.js
	src/middleware.js
	src/models/user.js
2015-02-03 21:13:55 -06:00
Blade Barringer 8a8ce8d80d Moved folders to website directory 2015-02-03 14:10:55 -06:00