291a135fe1
Merge pull request #6023 from HabitRPG/sabrecat/world-boss
...
Fall 2015 World Boss
2015-10-08 11:15:00 -05:00
36d471ddff
Correct module exports
2015-10-08 08:42:42 -05:00
5e10b8f4c9
Correct assinging of tavernQuest object when boss damage is calculated
2015-10-08 08:32:40 -05:00
9e88d17a78
Adjust tavern export to send over only quest object
2015-10-08 07:45:25 -05:00
51355f7eea
fix(quest-eggs): Short-circuit canBuy
...
Also corrects the FAQ link in the site footer to use the new static FAQ page instead of the wiki.
2015-10-06 16:56:17 -04:00
d27fb9dba2
WIP(world-boss): Rage and rewards
...
Also finishes out written story content.
2015-10-06 15:59:16 -04:00
3ca836a81c
fix(world-boss): Pass test
...
Also uncomment the line used to hide display of the boss in the Tavern, because we won't be doing a dry run of that style this time around.
2015-10-05 17:18:44 -04:00
f6abcc0ddf
WIP(world-boss): Initial stats outlay
...
Also quest reward sprites, groundwork for world damage, and partial content build.
2015-10-05 16:59:19 -04:00
0d7a57d176
Merge branch 'develop' into sabrecat/world-boss
...
Conflicts:
common/dist/sprites/habitrpg-shared.css
2015-10-05 14:57:59 -04:00
dd53383ec6
Merge pull request #6002 from HabitRPG/sabrecat/backgrounds-201510
...
October 2015 backgrounds
2015-10-05 11:29:44 -05:00
2683b2b0a0
Use var to declare mongoose
2015-10-03 20:55:28 -05:00
56419aee25
feat(content): October 2015 backgrounds
2015-10-02 16:13:11 -04:00
be3decf859
Merge branch 'develop' into refactor-content
2015-10-01 21:20:04 -05:00
8e69681718
chore(news): Bailey 2015-10-01
2015-10-01 15:48:18 -04:00
233211adc9
Merge pull request #5962 from HabitRPG/sabrecat/magic-potions
...
Magic Potions!
2015-10-01 14:04:14 -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
6c9fab254d
Add coffeescript dependency back in
2015-09-30 22:49:19 -05:00
08e6759da2
Fix path to content
2015-09-30 22:38:23 -05:00
6ad7b6ba4c
Correct content in analytics
2015-09-30 20:56:40 -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
feff6fadfa
feat(magic-potions): Final tweaks
2015-09-28 14:58:46 -04:00
8dcfe3078f
fix(inventory): Missing pixel paws
2015-09-25 16:31:07 -04:00
38bdbf020b
feat(content): Generalize canBuy
2015-09-25 15:01:08 -04:00
c21802e7e7
Merge branch 'develop' into refactor-content
2015-09-25 12:22:11 -05:00
a0f84bcf48
fix a few eslint rules
2015-09-25 15:58:39 +02:00
04416c4d73
feat(pets): Improve egg canBuy logic
2015-09-24 17:33:58 -04:00
6d6f0f597b
feat(world-boss): Dry run
2015-09-24 15:39:16 -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
009c92b532
feat(content): September sub items and customizations
2015-09-23 15:23:42 -04:00
955c163544
Merge branch 'develop' into refactor-content
2015-09-23 07:52:36 -05: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
389b5b370a
feat(pets): Magic Hatching Potions WIP
2015-09-21 17:12:23 -04:00
b3297383d3
Merge pull request #5954 from HabitRPG/sabrecat/fall-2015
...
Fall Festival 2015
2015-09-21 12:06:40 -05:00
2a530a207d
Rename translation key
2015-09-19 10:41:21 -05:00
ec336c4f88
added link to the newbies guild
2015-09-19 01:11:27 +03:00
aed39a206d
fix(services): Remove accidental WIP inclusion
2015-09-18 15:24:56 -04:00
3e8a3ee5f4
feat(event): Fall Festival 2015
2015-09-18 15:19:59 -04:00
4525ee5358
Revert "Revert "Removed user's party invites when last user leaves party""
2015-09-17 23:27:21 -04:00
c26cd1fe5b
Revert "Removed user's party invites when last user leaves party"
2015-09-17 04:00:07 -04:00
347d028af7
fix(API): Fix inaccessible route
...
Mystic Hourglass routes aren't yet used by live code.
2015-09-17 01:57:28 -04:00
8881dbc034
Remove uneeded blank spaces
2015-09-16 20:01:42 -05:00
9be0990217
chore(news): Bailey 2015-09-16
2015-09-16 18:34:20 -04:00
eb0dd636c1
feat(hourglass): Confirm before buy
2015-09-16 17:40:25 -04:00
fb50f27fa7
fix(hourglass): Use method on $scope
2015-09-16 16:46:12 -04:00
Sabe Jones