913faeba70
Remved unused readme
2015-10-01 22:38:58 -05:00
22c69c7e2f
fix(magic-potions): Correct potion list merge
2015-10-01 16:53:11 -04:00
8e69681718
chore(news): Bailey 2015-10-01
2015-10-01 15:48:18 -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
bebc4556ea
Merge pull request #5992 from crookedneighbor/magic-potions-row
...
Put magic pets on their own row
2015-10-01 13:48:42 -05:00
0f8c3e03c2
Correct mount mixin
2015-10-01 13:25:00 -05:00
c8afac9580
Put magic pets on their own row
2015-10-01 13:21:15 -05:00
3968acecb4
chore(news): Bailey 2015-09-30
2015-09-30 15:39:38 -04: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
f1e442bed4
Extract test commands into constants
2015-09-28 08:54:53 -05:00
2d862593ae
Compile sprites
2015-09-28 08:50:20 -05:00
1616b237fa
Revert npm bin commit
...
Vagrant installs don't use the .bin directory because Virtualbox has issues with symlinks see https://github.com/HabitRPG/habitrpg/issues/4591#issuecomment-72344790
2015-09-27 22:54:01 -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
64b36f8f2a
Merge pull request #5916 from TheHollidayInn/user-remove-invites-when-cancels-account-tests
...
Added test to check that group invites are removed when user cancels account
2015-09-26 12:44:12 -05:00
b9490a2aa4
change --no-bin-link to the correct --no-bin-links for npm install step - ref https://docs.npmjs.com/cli/install
2015-09-26 09:11:23 +10:00
8dcfe3078f
fix(inventory): Missing pixel paws
2015-09-25 16:31:07 -04:00
926bedcfea
fix(test): Change quest's canBuy to fn call
2015-09-25 15:16:17 -04:00
38bdbf020b
feat(content): Generalize canBuy
2015-09-25 15:01:08 -04:00
a0f84bcf48
fix a few eslint rules
2015-09-25 15:58:39 +02:00
5ac46716a3
add eslint tasks to gulp, remove .jshintrc
2015-09-25 15:44:45 +02: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
35068481c4
chore(news): Fall plotline Bailey
2015-09-23 15:58:13 -04:00
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
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
acd3480b51
fix(test): Remove only
2015-09-21 17:14:57 -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
ca6137a24e
Remove unneeded file
2015-09-19 09:11:51 -05:00
Blade Barringer