22c69c7e2f
fix(magic-potions): Correct potion list merge
2015-10-01 16:53:11 -04:00
fc46023561
feat(armoire): October content
...
(cherry picked from commit 2b2a85838dbc4539d41e6e2d508374b0960238d6)
Conflicts:
common/dist/sprites/habitrpg-shared.css
common/dist/sprites/spritesmith-main-3.png
common/dist/sprites/spritesmith-main-4.css
common/dist/sprites/spritesmith-main-4.png
common/dist/sprites/spritesmith-main-5.css
common/dist/sprites/spritesmith-main-5.png
common/dist/sprites/spritesmith-main-6.css
common/dist/sprites/spritesmith-main-6.png
common/dist/sprites/spritesmith-main-7.css
common/dist/sprites/spritesmith-main-7.png
common/dist/sprites/spritesmith-main-8.css
common/dist/sprites/spritesmith-main-8.png
common/dist/sprites/spritesmith-main-9.css
common/dist/sprites/spritesmith-main-9.png
2015-10-01 14:21:01 -05:00
233211adc9
Merge pull request #5962 from HabitRPG/sabrecat/magic-potions
...
Magic Potions!
2015-10-01 14:04:14 -05:00
3d38777ec8
fix(content): Correctly generate api.hatchingPotions
2015-10-01 14:54:52 -04:00
c8afac9580
Put magic pets on their own row
2015-10-01 13:21:15 -05:00
ffe0cff7cd
fix(drops): Pick drop eggs from dropEggs
2015-09-28 16:28:59 -04:00
feff6fadfa
feat(magic-potions): Final tweaks
2015-09-28 14:58:46 -04:00
38bdbf020b
feat(content): Generalize canBuy
2015-09-25 15:01:08 -04:00
04416c4d73
feat(pets): Improve egg canBuy logic
2015-09-24 17:33:58 -04:00
0ceba13e7c
feat(analytics): Track daily progress
...
Adds progressUp and progressDown event properties to the Cron analytics event. With these, we can total up the site population's quest progress, both positive and negative, for the purposes of estimating likely pace of battle with a World Boss. Note that these values are tracked regardless of whether or not the user is currently questing.
2015-09-24 16:40:20 -04:00
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
c953a25fe4
Merge branch 'develop' into sabrecat/magic-potions
2015-09-23 16:08:47 -04:00
009c92b532
feat(content): September sub items and customizations
2015-09-23 15:23:42 -04:00
8c67d22a91
feat(pets): Full purchase behavior
2015-09-22 17:03:41 -04:00
e96410aa57
feat(pets): Spooky pets/mounts
2015-09-22 14:23:52 -04:00
389b5b370a
feat(pets): Magic Hatching Potions WIP
2015-09-21 17:12:23 -04:00
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
b3297383d3
Merge pull request #5954 from HabitRPG/sabrecat/fall-2015
...
Fall Festival 2015
2015-09-21 12:06:40 -05:00
b608e061a5
test(drops): Generalize
2015-09-21 12:57:35 -04:00
f7478aa81d
add value 100 (gold cost) to Enchanted Armoire items that were missing it
2015-09-19 08:46:04 +10:00
3e8a3ee5f4
feat(event): Fall Festival 2015
2015-09-18 15:19:59 -04:00
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
ce764ca28e
WIP(hourglass): Mystery sets API route
2015-09-15 15:41:57 -04:00
2ce52e980d
feat(hourglass): Buy pets/mounts
2015-09-15 14:55:38 -04:00
66a8be526b
WIP(hourglass): Error catches
2015-09-15 12:40:01 -05:00
bc16ec1729
Merge branch 'develop' into sabrecat/timetravel-stable
2015-09-15 11:32:28 -05:00
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
e32de87991
Adjust numbering of faq.js
2015-09-06 19:44:37 -05:00
6fd2b9e537
Update content with web faq
2015-09-06 17:13:04 -05:00
2fcc7df218
Change name of locales keys
2015-09-06 16:36:21 -05:00
1bce23c12b
Transform magic number to constant
2015-09-06 16:22:06 -05:00
898ea845b3
Convert translation function to js
2015-09-06 16:20:14 -05:00
245c7d48c8
Simplify faq logic
2015-09-06 16:11:53 -05:00
4081a9a62a
Add faq to content
2015-09-06 16:08:53 -05:00
8a06514c72
Move translation function to separate module
2015-09-06 15:54:38 -05:00
b9bbc3f1ea
Move content to own directory
2015-09-06 15:31:08 -05:00
5274fd236a
WIP(time-travel): Time Travel pets/mounts
...
Also begins process of adding tests for Mystic Hourglass purchases.
2015-09-01 17:17:50 -04:00
6f85fcfde2
Merge branch 'develop' into sabrecat/party-page
...
Conflicts:
common/dist/sprites/habitrpg-shared.css
common/dist/sprites/spritesmith0.png
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-01 13:40:20 -05:00
3ccf09ca27
feat(quests): Horse quest
2015-09-01 13:26:41 -04:00
5ba6cfc2f5
feat(content): September content adds
2015-08-31 18:16:54 -04:00
15a6929b44
Merge branch 'develop' into sabrecat/party-page
2015-08-28 08:41:57 -05:00
049f9280a2
Merge pull request #5798 from Alys/rebirth-keeps-free-gear-2015-08-12
...
prevent Orb of Rebirth from removing free gear (equipment that has zero gold cost) - partial fix for https://github.com/HabitRPG/habitrpg/issues/5750
2015-08-26 22:01:29 +10:00
bbcb9e6063
fix problem of Cheetah Costume Set mystery items not staying put -- code is ugly, improve later
2015-08-25 19:23:25 +10:00
9ed1e2ba6d
fix(mystery): Force coffee compile
2015-08-24 23:37:54 -05:00
d70aa46ec1
fix(mystery): Adjust date range
2015-08-24 21:33:02 -05:00
c23312f771
feat(mystery): 2015 August items
2015-08-24 17:19:12 -04:00
65888d3f8a
Merge branch 'develop' into sabrecat/party-page
2015-08-20 07:39:25 -05:00
190fdd5bb9
feat(pets): August cheetah quest
2015-08-19 16:55:14 -04:00
f792155b45
Order quests with array
2015-08-17 21:48:58 -05:00
344eded949
Merge branch 'develop' into sabrecat/party-page
2015-08-17 19:04:25 -05:00
Sabe Jones