Commit Graph

10950 Commits

Author SHA1 Message Date
Sabe Jones 9afaa92c2e feat(magic-potions): Clarify drop behavior 2015-09-30 15:31:09 -04:00
Sabe Jones ffe0cff7cd fix(drops): Pick drop eggs from dropEggs 2015-09-28 16:28:59 -04:00
Sabe Jones feff6fadfa feat(magic-potions): Final tweaks 2015-09-28 14:58:46 -04:00
Sabe Jones 8dcfe3078f fix(inventory): Missing pixel paws 2015-09-25 16:31:07 -04:00
Sabe Jones 926bedcfea fix(test): Change quest's canBuy to fn call 2015-09-25 15:16:17 -04:00
Sabe Jones 38bdbf020b feat(content): Generalize canBuy 2015-09-25 15:01:08 -04:00
Sabe Jones 04416c4d73 feat(pets): Improve egg canBuy logic 2015-09-24 17:33:58 -04:00
Sabe Jones 1aa5757847 fix(magic-potions): Hatching tweaks
* Additional notes on popover noting magic potions can't be used on quest pet eggs
* Less techy error message when attempting to hatch quest pet egg with magic potion
* Don't highlight quest pet eggs as targets for magic hatching potion
2015-09-23 16:40:45 -04:00
Sabe Jones c953a25fe4 Merge branch 'develop' into sabrecat/magic-potions 2015-09-23 16:08:47 -04:00
Sabe Jones 35068481c4 chore(news): Fall plotline Bailey 2015-09-23 15:58:13 -04:00
Sabe Jones c2269b5f35 Merge pull request #5967 from HabitRPG/sabrecat/content-201509
September subscriber items and Fall Festival avatar customizations
2015-09-23 14:43:06 -05:00
Sabe Jones 009c92b532 feat(content): September sub items and customizations 2015-09-23 15:23:42 -04:00
Sabe Jones 6a6b67b9c1 Merge pull request #5909 from HabitRPG/sabrecat/social-buttons
Front page Tweet button
2015-09-22 17:38:47 -05:00
Sabe Jones 8c67d22a91 feat(pets): Full purchase behavior 2015-09-22 17:03:41 -04:00
Sabe Jones e96410aa57 feat(pets): Spooky pets/mounts 2015-09-22 14:23:52 -04:00
Sabe Jones cd9c372254 feat(pets): Spooky sprites 2015-09-22 12:45:59 -04:00
Sabe Jones acd3480b51 fix(test): Remove only 2015-09-21 17:14:57 -04:00
Sabe Jones 389b5b370a feat(pets): Magic Hatching Potions WIP 2015-09-21 17:12:23 -04:00
Sabe Jones 87f6af346a fix(misc): Tweaks
* Updates the text shown for Mystic Hourglasses in the inventory to account for new features.
* Fixes the date range for the Fall Festival to correctly start September 21.
* Updates test for the Inventory Controller to use lodash for object key iteration.
2015-09-21 13:59:00 -04:00
Sabe Jones b3297383d3 Merge pull request #5954 from HabitRPG/sabrecat/fall-2015
Fall Festival 2015
2015-09-21 12:06:40 -05:00
Sabe Jones b608e061a5 test(drops): Generalize 2015-09-21 12:57:35 -04:00
Blade Barringer fd0dcbebde chore(i18n): update locales 2015-09-19 15:19:47 -05:00
Blade Barringer 87197bea8a Merge branch 'LuneFox-develop' into develop 2015-09-19 10:41:47 -05:00
Blade Barringer 2a530a207d Rename translation key 2015-09-19 10:41:21 -05:00
Blade Barringer ca6137a24e Remove unneeded file 2015-09-19 09:11:51 -05:00
LuneFox 512b959cab Merge pull request #1 from LuneFox/origin
#5955
2015-09-19 02:01:43 +03:00
LuneFox 8ae1c35b27 added string for askQuestion 2015-09-19 01:57:30 +03:00
Alys f7478aa81d add value 100 (gold cost) to Enchanted Armoire items that were missing it 2015-09-19 08:46:04 +10:00
LuneFox 91a0e0452e added match for askQuestion 2015-09-19 01:12:30 +03:00
LuneFox ec336c4f88 added link to the newbies guild 2015-09-19 01:11:27 +03:00
Sabe Jones bbf9f45aa4 fix(test): Seasonal food drop 2015-09-18 15:32:24 -04:00
Sabe Jones aed39a206d fix(services): Remove accidental WIP inclusion 2015-09-18 15:24:56 -04:00
Sabe Jones 3e8a3ee5f4 feat(event): Fall Festival 2015 2015-09-18 15:19:59 -04:00
Sabe Jones 6449fbdbc0 feat(event): Fall 2015 sprites 2015-09-18 12:42:55 -05:00
Kevin Gisi ff52aca587 Merge pull request #5951 from HabitRPG/revert-5943-revert-5912-group-remove-party-invites-when-last-member-leaves
Revert "Revert "Removed user's party invites when last user leaves pa…
2015-09-17 20:27:52 -07:00
Kevin Gisi 4525ee5358 Revert "Revert "Removed user's party invites when last user leaves party"" 2015-09-17 23:27:21 -04:00
Kevin Gisi e15cc9ec82 Merge pull request #5943 from HabitRPG/revert-5912-group-remove-party-invites-when-last-member-leaves
Revert "Removed user's party invites when last user leaves party"
2015-09-17 01:08:37 -07:00
Kevin Gisi c26cd1fe5b Revert "Removed user's party invites when last user leaves party" 2015-09-17 04:00:07 -04:00
Sabe Jones 347d028af7 fix(API): Fix inaccessible route
Mystic Hourglass routes aren't yet used by live code.
2015-09-17 01:57:28 -04:00
Sabe Jones 09ccb9584f Merge pull request #5938 from HabitRPG/sabrecat/timetravel-stable
Time Travel Stable
2015-09-16 18:31:48 -05:00
Sabe Jones 15cddabd80 fix(test): Remove only 2015-09-16 19:21:05 -04:00
Sabe Jones f8db8f597a refactor(test): Give user mystery items
...instead of stubbing out timeTravelerStore
2015-09-16 19:16:21 -04:00
Sabe Jones 9be0990217 chore(news): Bailey 2015-09-16 2015-09-16 18:34:20 -04: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
Sabe Jones 2bde07fa1c fix(test): Call hasAll correctly 2015-09-16 16:12:29 -04:00
Sabe Jones 7cc29810f3 fix(test): inject Content
Also refactors to remove lodash where it's overkill.
2015-09-16 16:01:13 -04:00
Sabe Jones 3bfeb15715 test(hourglass): TDD for Time Travel filtering 2015-09-16 15:27:19 -04:00
Sabe Jones c8cc01fc44 feat(hourglass): Buy pets/mounts
Functionally complete as of this commit. Further commits will provide more polish and refactoring.
2015-09-16 14:35:43 -04:00