Commit Graph

53 Commits

Author SHA1 Message Date
Keith Holliday
b037ddd14c Ported User Serivce to client side and to api v3 2016-05-10 15:15:55 -05:00
Keith Holliday
fd244ac021 Turned on client side tests. Fixed broken tests 2016-05-05 23:36:17 -05:00
Sabe Jones
ccdbdb2969 fix(seasonal-shop): choose quest more precisely 2016-03-17 13:13:21 -04:00
Sabe Jones
10a8476aaf WIP(event): Spring Fling cont'd 2016-03-17 13:10:05 -04:00
Sabe Jones
6ed9133f70 WIP(event): Winter Wonderland 2015-16 partial 2015-12-15 17:15:02 -05:00
Sabe Jones
dd4ca5c476 refactor(modals): More readable invalid hatch check 2015-12-07 16:00:52 -05:00
Sabe Jones
0f578b79ff feat(pets): Peppermint Hatching Potions
Also fixes an issue where the pet hatching modal would appear when the user attempted to hatch a premium version of a quest pet.
2015-12-04 17:20:33 -05:00
Sabe Jones
483ff8cb67 Merge pull request #6275 from TheHollidayInn/tasks-add-push-to-bottom
Tasks add push to bottom
2015-12-01 14:20:02 -06:00
Sabe Jones
dd3218ebbd refactor(modal): Remove unnecessary ternary 2015-11-30 16:43:46 -05:00
Sabe Jones
3a20455cda fix(modals): Rehatch pets
Corrects an issue with #6281 that would cause the pet hatching modal to fail to display if the pet had a value of -1 (i.e. raised to a mount and not yet re-hatched).
2015-11-30 16:11:13 -05:00
Sabe Jones
3c672ea814 Merge pull request #6281 from TheHollidayInn/inventory-prevent-hatch-model-from-showing-on-hatched-pet
Prevented modal from showing when user tries to hatch a pet they own
2015-11-26 11:56:38 -06:00
Sabe Jones
28205663e4 fix(modals): Show mount modal more often
Fixes #6288. Previously, we used a count of all properties within the user's items.pets.mounts to determine whether or not they'd gained a new mount. That would not work as expected if they had mounts with a null or false status, such as after using the Key to the Kennels. This commit also adds some tests to the inventory controller in Angular for pet raising.
2015-11-24 16:54:59 -05:00
Keith Holliday
b6e79f3ba8 Prevented modal from showing when user tries to hatch a pet they own 2015-11-23 10:20:39 -06:00
Keith Holliday
9a8f9c6938 Fixed wording to be parallel with logic 2015-11-22 15:59:18 -06:00
Blade Barringer
5b7c02334a Adjust sm modal to not attach objects on rootScope 2015-11-17 21:23:20 -06:00
Blade Barringer
b280267cde Expand object to make it more readable. 2015-11-17 21:10:29 -06:00
Sabe Jones
f5f33bd1b9 fix(modals): SM modal fixes
Fixes #6253, allows quest pets to appear in hatching and raising modals, and makes code for deciding whether or not to show a generic levelup modal a bit more readable per comments on #6042.
2015-11-17 16:56:11 -05:00
Sabe Jones
23df5b608d feat(sharing): Remaining cheevo modals 2015-11-10 13:43:37 -05:00
Sabe Jones
875f2ac552 feat(sharing): More achievements 2015-11-10 00:08:17 -05:00
Sabe Jones
22caaa7eda feat(sharing): More opt outs
Also fixes a bug where "Display Now" didn't work for pets with a space in their name.
2015-10-28 17:48:16 -04:00
Sabe Jones
aad3e5ade6 fix(sharing): Add social service to Inventory
Also fixes accidental 'only' in tests.
2015-10-28 16:52:07 -04:00
Sabe Jones
f4ea6c1d5d feat(sharing): Opt Out WIP
First draft of support for opting out of future modal display on specific events, and adds the second barebones target page for sharing.
2015-10-28 16:36:47 -04:00
Sabe Jones
338aced208 feat(modals): Grew Mount
A modal now appears when you raise a pet into a mount, which allows the user to immediately equip the new mount.
2015-10-15 17:33:20 -04:00
Sabe Jones
c6dd2a0d10 feat(modals): Hatch Pet modal
Complete except for the planned addition of a heart sprite over the pet.
2015-10-15 16:34:53 -04:00
Blade Barringer
8881dbc034 Remove uneeded blank spaces 2015-09-16 20:01:42 -05:00
Sabe Jones
eb0dd636c1 feat(hourglass): Confirm before buy 2015-09-16 17:40:25 -04:00
Sabe Jones
fb50f27fa7 fix(hourglass): Use method on $scope 2015-09-16 16:46:12 -04:00
Sabe Jones
98cd8364c6 feat(hourglass): Individual filter functions 2015-09-16 16:35:04 -04:00
Blade Barringer
0fe6054b76 Add missing client code 2015-09-15 10:53:56 -05:00
Blade Barringer
5553d74334 Create method to calculate whether or not user has attained all mystery equipment 2015-09-13 16:26:29 -05:00
Blade Barringer
203a26b6df Refactor how cards are recieved 2015-08-12 08:36:57 -05:00
Blade Barringer
8a363efc43 Merge branch 'develop' into TheHollidayInn-pet-actions-esc-to-cancel 2015-07-22 17:59:50 -05:00
Blade Barringer
c41271e558 Merge branch 'develop' into refactor_member_modal_and_stats_page 2015-07-22 17:39:39 -05:00
Blade Barringer
f40cfd2b66 Move all pet counting to shared count scripts 2015-07-22 17:32:12 -05:00
TheHollidayInn
c61eccaaba Removed if statements and fixed style issues 2015-07-22 15:38:17 -05:00
TheHollidayInn
107e27a2c6 Deselect food, egg, and potion when hitting the escape key 2015-07-21 21:52:29 -05:00
Sabe Jones
0313170921 feat(quests): Invite party button 2015-07-21 15:25:34 -05:00
Blade Barringer
65c14b1e3f Refactor inventory ctrl variables 2015-07-20 12:51:10 -05:00
Blade Barringer
3d40da4004 Remove countPets and countMounts from codebase 2015-07-20 08:11:00 -05:00
Sabe Jones
78d4989544 WIP(event): Summer Splash cont'd
Splits Quests out to a new page. Refactors inventory Jade files and controllers to more manageable structures.
2015-07-08 16:13:23 -05:00
Sabe Jones
2ce1daffb8 feat(analytics): call service from app 2015-06-22 16:35:17 -05:00
Sabe Jones
56a461c513 Revert "feat(analytics): Analytics service"
This reverts commit 9a0e31db40.
2015-06-22 14:14:33 -05:00
Sabe Jones
9a0e31db40 feat(analytics): Analytics service
Inject Analytics service into controllers where needed. Call Analytics service instead of GA or Mixpanel for tracking within the app.
2015-06-22 11:21:02 -05:00
Sabe Jones
726a8f1acb feat(analytics): Mixpanel implementation WIP 2015-05-29 16:22:35 -05: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
ae25af7c02 fix(shop): Enable head accessories 2015-03-20 15:27:56 -05:00
Sabe Jones
f3f5669ab2 feat(spring): Fling 2015-03-20 14:56:00 -05:00
Alice Harris
44259925e4 re-add the dequip option for removing backgrounds with proper bug fix (ref 9199c6c7e2); make whitespace consistent 2015-03-16 19:27:44 +10:00
Alice Harris
9199c6c7e2 remove unequip background feature temporarily - fixes https://github.com/HabitRPG/habitrpg/issues/4857#issuecomment-80722868 2015-03-15 07:44:36 +10:00
kholliday
fc3e1c6c9b Added ability to remove pet, mount, and background. Also, changed text for all dequip buttons. 2015-03-08 15:35:37 -05:00