22c69c7e2f
fix(magic-potions): Correct potion list merge
2015-10-01 16:53:11 -04:00
5349bc7312
chore(gulp): Compile sprites
2015-10-01 14:27:21 -05: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
f4c18bb7f3
chore(gulp): Compile sprites
2015-10-01 14:11:22 -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
9afaa92c2e
feat(magic-potions): Clarify drop behavior
2015-09-30 15:31:09 -04:00
5c0a0e1d18
Compile css
2015-09-29 17:30:08 -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
2d862593ae
Compile sprites
2015-09-28 08:50:20 -05:00
6902d9aa2f
swap README files for en and zk. What WAS I thinking?
2015-09-27 06:52:23 +10:00
7b4c50bdb7
update locales edit/translate instructions
2015-09-27 06:13:56 +10:00
38bdbf020b
feat(content): Generalize canBuy
2015-09-25 15:01:08 -04:00
b27a12b54d
Merge pull request #5973 from HabitRPG/sabrecat/quest-analytics
...
Track daily quest progress in server-side analytics
2015-09-24 20:57:07 -05:00
04416c4d73
feat(pets): Improve egg canBuy logic
2015-09-24 17:33:58 -04:00
5d6efd4f9d
fix(sprite): clean up horse
2015-09-24 15:52:41 -05: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
6a6b67b9c1
Merge pull request #5909 from HabitRPG/sabrecat/social-buttons
...
Front page Tweet button
2015-09-22 17:38:47 -05: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
cd9c372254
feat(pets): Spooky sprites
2015-09-22 12:45:59 -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
fd0dcbebde
chore(i18n): update locales
2015-09-19 15:19:47 -05:00
87197bea8a
Merge branch 'LuneFox-develop' into develop
2015-09-19 10:41:47 -05:00
2a530a207d
Rename translation key
2015-09-19 10:41:21 -05:00
8ae1c35b27
added string for askQuestion
2015-09-19 01:57:30 +03: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
6449fbdbc0
feat(event): Fall 2015 sprites
2015-09-18 12:42:55 -05:00
eb0dd636c1
feat(hourglass): Confirm before buy
2015-09-16 17:40:25 -04:00
3bfeb15715
test(hourglass): TDD for Time Travel filtering
2015-09-16 15:27:19 -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
38e07246da
chore(i18n): update locales
2015-09-13 18:38:59 -05:00
737b4703e6
Fix markdown bug in faq. Fixes #5920
2015-09-13 18:36:36 -05:00
d573f3c53d
Merge branch 'melarish-Mystery_items_already_owned' into develop
2015-09-13 18:28:18 -05:00
909ab4eb35
remove extra line breaks from "What are some sample tasks?" FAQ question - fixes https://github.com/HabitRPG/habitrpg/issues/5920
2015-09-14 07:07:12 +10:00
7aad958062
Merge pull request #5922 from crookedneighbor/gulpify
...
Gulpify the sprites tasks
2015-09-13 02:15:05 -05:00
41458fbd5b
chore(i18n): update locales
2015-09-12 22:26:30 -05:00
Sabe Jones