Commit graph

927 commits

Author SHA1 Message Date
Sabe Jones
152fb72899 fix(sharing): Needed return object 2015-10-22 15:08:04 -04:00
Sabe Jones
e2cfd1bd54 feat(sharing): Load widgets from service 2015-10-22 14:37:29 -04:00
Sabe Jones
281411f423 Merge branch 'develop' into sabrecat/more-modals 2015-10-22 14:05:26 -04:00
Sabe Jones
bcc522f08d feat(sharing): Add Tumblr button 2015-10-22 13:52:26 -04:00
Sabe Jones
d08a3efbcd fix(news): Bogus trailing slash 2015-10-22 12:04:43 -05:00
Sabe Jones
9fb671f068 fix(social): Better share image 2015-10-21 16:25:03 -05:00
Sabe Jones
a2c0e02283 fix(social): Correct OG tag errors 2015-10-21 16:37:33 -04:00
Sabe Jones
d32f6f23cc feat(sharing): Improved front page FB share 2015-10-21 15:59:17 -04:00
Sabe Jones
44818882f6 feat(sharing): Pretty Tweet button for level up 2015-10-21 15:23:31 -04:00
Sabe Jones
5fbd6814b0 fix(pets): Realign frog sprites
Also adds a note about the To-Do sorting fix to the Bailey announcement
2015-10-20 18:55:57 -04:00
Sabe Jones
1ad6ffd35d Merge branch 'develop' into sabrecat/more-modals 2015-10-20 12:50:34 -04:00
Sabe Jones
d0a34fc0ad feat(quests): 2015-10 Pet
Also adds Exhaust Strike-specific text to the remaining affected NPCs.
2015-10-20 12:32:45 -04:00
Sabe Jones
0a6d9fa23a WIP(pets): Frog quest 2015-10-19 23:12:24 -04:00
Blade Barringer
9ad1dbd8ce Adjust mystic hourglass string to take in interpolation 2015-10-19 08:10:37 -05:00
Blade Barringer
1a2510e4da Adjsut string to take in interpolation 2015-10-19 08:03:27 -05:00
Sabe Jones
22ec450521 feat(modals): Won Challenge
Draft of the modal that appears when a user wins a challenge. Needs better logic for when to display.
2015-10-16 23:36:57 -04:00
ksami
65dc274e49 Make text in options/settings translatable 2015-10-16 20:48:12 +08:00
Sabe Jones
338aced208 feat(modals): Grew Mount
A modal now appears when you raise a pet into a mount, which allows the user to immediately equip the new mount.
2015-10-15 17:33:20 -04:00
Sabe Jones
c6dd2a0d10 feat(modals): Hatch Pet modal
Complete except for the planned addition of a heart sprite over the pet.
2015-10-15 16:34:53 -04:00
Sabe Jones
380265731f feat(world-boss): Exhaust Ian's text 2015-10-14 21:02:59 -04:00
Sabe Jones
e88030e15f Merge pull request #6039 from HabitRPG/sabrecat/halloween-mount
Jack-O'-Lantern mounts
2015-10-14 16:46:55 -05:00
Sabe Jones
59b2c1662e fix(news): Revised Bailey 2015-10-14 12:54:33 -04:00
Rory O’Kane
4a23f40415 Fix capitalization of “GitHub” on Contact Us page
The live page is at https://habitica.com/static/contact.
2015-10-14 03:55:46 -04:00
Sabe Jones
6505824cb6 feat(modals): Levelup modal
Introduces a new modal that displays whenever the user levels up.
2015-10-13 16:32:07 -04:00
Sabe Jones
5eacba54b8 feat(modals): Slim scroll notif
Establishes a new template for modal notifications, to be used across the app including a number of new notifications.
2015-10-13 14:20:51 -04:00
Sabe Jones
dcf17b5505 feat(event): Jack-O'-Lantern mounts 2015-10-12 14:49:12 -04:00
Alys
ece3e0d0aa add FAQ item for World Bosses 2015-10-12 21:26:59 +10:00
Phillip Thelen
87012f6a7c Add iOS start app banner 2015-10-10 13:52:53 +02:00
Sabe Jones
f00bbd9652 feat(modals): Small style scroll award 2015-10-09 15:39:36 -04:00
Sabe Jones
b775b8f399 feat(modals): Simplified scroll drop
Conflicts:
	website/views/shared/modals/quests.jade
2015-10-09 14:07:54 -04:00
Sabe Jones
291a135fe1 Merge pull request #6023 from HabitRPG/sabrecat/world-boss
Fall 2015 World Boss
2015-10-08 11:15:00 -05:00
Sabe Jones
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
Sabe Jones
d27fb9dba2 WIP(world-boss): Rage and rewards
Also finishes out written story content.
2015-10-06 15:59:16 -04:00
Sabe Jones
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
Sabe Jones
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
Sabe Jones
0d7a57d176 Merge branch 'develop' into sabrecat/world-boss
Conflicts:
	common/dist/sprites/habitrpg-shared.css
2015-10-05 14:57:59 -04:00
Sabe Jones
56419aee25 feat(content): October 2015 backgrounds 2015-10-02 16:13:11 -04:00
Sabe Jones
8e69681718 chore(news): Bailey 2015-10-01 2015-10-01 15:48:18 -04:00
Sabe Jones
233211adc9 Merge pull request #5962 from HabitRPG/sabrecat/magic-potions
Magic Potions!
2015-10-01 14:04:14 -05:00
Blade Barringer
0f8c3e03c2 Correct mount mixin 2015-10-01 13:25:00 -05:00
Blade Barringer
c8afac9580 Put magic pets on their own row 2015-10-01 13:21:15 -05:00
Sabe Jones
3968acecb4 chore(news): Bailey 2015-09-30 2015-09-30 15:39:38 -04:00
Sabe Jones
9afaa92c2e feat(magic-potions): Clarify drop behavior 2015-09-30 15:31:09 -04:00
Sabe Jones
feff6fadfa feat(magic-potions): Final tweaks 2015-09-28 14:58:46 -04:00
Sabe Jones
8dcfe3078f fix(inventory): Missing pixel paws 2015-09-25 16:31:07 -04:00
Sabe Jones
38bdbf020b feat(content): Generalize canBuy 2015-09-25 15:01:08 -04:00
Sabe Jones
04416c4d73 feat(pets): Improve egg canBuy logic 2015-09-24 17:33:58 -04:00
Sabe Jones
6d6f0f597b feat(world-boss): Dry run 2015-09-24 15:39:16 -04:00
Sabe Jones
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
Sabe Jones
c953a25fe4 Merge branch 'develop' into sabrecat/magic-potions 2015-09-23 16:08:47 -04:00