Commit Graph

262 Commits

Author SHA1 Message Date
Sabe Jones 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
Sabe Jones 009c92b532 feat(content): September sub items and customizations 2015-09-23 15:23:42 -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
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 ce764ca28e WIP(hourglass): Mystery sets API route 2015-09-15 15:41:57 -04:00
Sabe Jones 2ce52e980d feat(hourglass): Buy pets/mounts 2015-09-15 14:55:38 -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
Sabe Jones 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
Sabe Jones 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
Sabe Jones 3ccf09ca27 feat(quests): Horse quest 2015-09-01 13:26:41 -04:00
Sabe Jones 5ba6cfc2f5 feat(content): September content adds 2015-08-31 18:16:54 -04:00
Blade Barringer 15a6929b44 Merge branch 'develop' into sabrecat/party-page 2015-08-28 08:41:57 -05:00
Alys 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
Alys 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
Sabe Jones 9ed1e2ba6d fix(mystery): Force coffee compile 2015-08-24 23:37:54 -05:00
Sabe Jones d70aa46ec1 fix(mystery): Adjust date range 2015-08-24 21:33:02 -05:00
Sabe Jones c23312f771 feat(mystery): 2015 August items 2015-08-24 17:19:12 -04:00
Blade Barringer 65888d3f8a Merge branch 'develop' into sabrecat/party-page 2015-08-20 07:39:25 -05:00
Sabe Jones 190fdd5bb9 feat(pets): August cheetah quest 2015-08-19 16:55:14 -04:00
Blade Barringer f792155b45 Order quests with array 2015-08-17 21:48:58 -05:00
Blade Barringer 344eded949 Merge branch 'develop' into sabrecat/party-page 2015-08-17 19:04:25 -05:00
Alys 57e7fc93d7 prevent Orb of Rebirth removing free equipment (gear that has zero gold cost) - partial fix for https://github.com/HabitRPG/habitrpg/issues/5750 2015-08-16 12:33:40 +10:00
Alys 7f0889f405 remove commented-out default task code and unused default task locale strings - fixes https://github.com/HabitRPG/habitrpg/issues/5631#issuecomment-130619901 (comment by GitHubSphinx) 2015-08-15 13:23:42 +10:00
Sabe Jones 0f31873262 Merge branch 'develop' into sabrecat/party-page
Conflicts:
	common/dist/sprites/habitrpg-shared.css
	common/dist/sprites/spritesmith1.css
	common/dist/sprites/spritesmith1.png
	common/dist/sprites/spritesmith4.css
	common/dist/sprites/spritesmith4.png
	website/views/options/social/index.jade
2015-08-14 11:23:35 -05:00
Blade Barringer 998e336818 Remove extraneous white space 2015-08-14 07:40:07 -05:00
Blade Barringer 6be339fc77 Fix bug where armoire notes would not display correctly 2015-08-14 06:59:23 -05:00
Blade Barringer 576688c15b Clean up content file 2015-08-14 06:41:10 -05:00
Sabe Jones ab91a6fba9 Merge pull request #5781 from HabitRPG/sabrecat/greeting-cards
Greeting and Thank-You Cards
2015-08-13 22:35:25 -05:00
Sabe Jones 00a212660a feat(greeting-cards): Thank-You & Greets 2015-08-13 16:58:31 -05:00
Sabe Jones f57e3e69a1 WIP(greeting-cards): Working send + modals 2015-08-13 15:43:51 -05:00
Sabe Jones b2100c2c54 WIP(greeting-cards): Abandon spell refactor 2015-08-13 14:31:34 -05:00
Blade Barringer 39ead02d6c Remove comment 2015-08-12 19:09:11 -05:00
Blade Barringer bcf7c9712e Split out potion and armoire out of the itemStore object
Fixes #5743
2015-08-12 18:53:49 -05:00
Blade Barringer 203a26b6df Refactor how cards are recieved 2015-08-12 08:36:57 -05:00
Sabe Jones beacce7fe0 Merge branch 'develop' into sabrecat/party-page 2015-08-10 13:43:44 -05:00