Sabe Jones
feff6fadfa
feat(magic-potions): Final tweaks
2015-09-28 14:58:46 -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
009c92b532
feat(content): September sub items and customizations
2015-09-23 15:23:42 -04:00
Sabe Jones
e96410aa57
feat(pets): Spooky pets/mounts
2015-09-22 14:23:52 -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
Alys
f7478aa81d
add value 100 (gold cost) to Enchanted Armoire items that were missing it
2015-09-19 08:46:04 +10:00
Sabe Jones
3e8a3ee5f4
feat(event): Fall Festival 2015
2015-09-18 15:19:59 -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
Sabe Jones
66a8be526b
WIP(hourglass): Error catches
2015-09-15 12:40:01 -05:00
Sabe Jones
bc16ec1729
Merge branch 'develop' into sabrecat/timetravel-stable
2015-09-15 11:32:28 -05:00
Sabe Jones
41b4d497f7
Merge branch 'develop' into sabrecat/pet-201509
...
Conflicts:
common/dist/sprites/habitrpg-shared.css
common/dist/sprites/spritesmith2.css
common/dist/sprites/spritesmith2.png
common/dist/sprites/spritesmith3.css
common/dist/sprites/spritesmith3.png
common/dist/sprites/spritesmith4.css
common/dist/sprites/spritesmith4.png
2015-09-08 13:25:10 -05:00
Blade Barringer
e32de87991
Adjust numbering of faq.js
2015-09-06 19:44:37 -05:00
Blade Barringer
6fd2b9e537
Update content with web faq
2015-09-06 17:13:04 -05:00
Blade Barringer
2fcc7df218
Change name of locales keys
2015-09-06 16:36:21 -05:00
Blade Barringer
1bce23c12b
Transform magic number to constant
2015-09-06 16:22:06 -05:00
Blade Barringer
898ea845b3
Convert translation function to js
2015-09-06 16:20:14 -05:00
Blade Barringer
245c7d48c8
Simplify faq logic
2015-09-06 16:11:53 -05:00
Blade Barringer
4081a9a62a
Add faq to content
2015-09-06 16:08:53 -05:00
Blade Barringer
8a06514c72
Move translation function to separate module
2015-09-06 15:54:38 -05:00
Blade Barringer
b9bbc3f1ea
Move content to own directory
2015-09-06 15:31:08 -05:00
