Commit Graph

573 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
Anil Anar e269e04172 fix a minor syntax error when opening reroll modal. 2015-10-22 09:24:04 +02: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 0a6d9fa23a WIP(pets): Frog quest 2015-10-19 23:12:24 -04:00
Amin Arria 3bd809f7c2 Merge branch 'develop' of github.com:HabitRPG/habitrpg into Wrong-max-level-messages 2015-10-19 12:14:38 -04:30
Amin Arria 038039dbee Fixes #5550, change message according to rebirthLevel 2015-10-19 12:10:27 -04:30
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
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 59b2c1662e fix(news): Revised Bailey 2015-10-14 12:54:33 -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
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 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
ahstro 76fcbfc19f Toggle chevron direction
When editing a task, there are some expandable options available with a
chevron next to them (e.g. 'Tags' and 'Advanced Options'). This commit
makes the chevrons' directions toggle based on whether the related
option is expanded or collapsed, up and down respectively.
2015-10-05 22:17:28 +02: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 3968acecb4 chore(news): Bailey 2015-09-30 2015-09-30 15:39:38 -04:00
Sabe Jones 35068481c4 chore(news): Fall plotline Bailey 2015-09-23 15:58:13 -04:00
Sabe Jones 009c92b532 feat(content): September sub items and customizations 2015-09-23 15:23:42 -04:00
Sabe Jones 6a6b67b9c1 Merge pull request #5909 from HabitRPG/sabrecat/social-buttons
Front page Tweet button
2015-09-22 17:38:47 -05:00
Sabe Jones 3e8a3ee5f4 feat(event): Fall Festival 2015 2015-09-18 15:19:59 -04:00
Sabe Jones 9be0990217 chore(news): Bailey 2015-09-16 2015-09-16 18:34:20 -04:00
Blade Barringer f71e3e20eb Merge pull request #5934 from HabitRPG/adjustments_to_group_front_end_only
Adjustments to group quest behavior
2015-09-15 18:57:32 -05:00
Blade Barringer b32e521c56 Pull in client side changes for quest routes 2015-09-15 09:35:17 -05:00
Sabe Jones 580a9871b9 chore(news): Bailey 2015/09/14 2015-09-14 21:21:22 -05:00
Blade Barringer d573f3c53d Merge branch 'melarish-Mystery_items_already_owned' into develop 2015-09-13 18:28:18 -05:00
Alys fbaa5d4321 add new audi theme from LuneFox, moved themes to alphabetical order, adjusted file permissions for Watts Theme 2015-09-12 11:05:31 +10:00
Sabe Jones 6396b064d2 fix(social): Localize Tweet button 2015-09-10 18:51:19 -04:00
Sabe Jones 45c8bb06e2 Revert "feat(modals): Simplified scroll drop"
This reverts commit 8b4d34da00.
2015-09-10 18:08:51 -04:00
Sabe Jones c03107b54b feat(social): Twitter share main page 2015-09-10 17:54:40 -04:00
Sabe Jones e4c7870c22 WIP(social): Non-AddThis Tweet button 2015-09-10 17:31:12 -04:00
melarish 05cf144630 Pulled and merged 2015-09-09 23:23:45 +01:00
Sabe Jones 8b4d34da00 feat(modals): Simplified scroll drop 2015-09-09 14:27:34 -04:00
Sabe Jones 74cb7d7f04 chore(news): Horse Bailey 2015-09-08 14:56:49 -04:00
Blade Barringer 6a1d4adcda Merge branch 'develop' into HabitRPG-sabrecat/faq 2015-09-06 17:10:45 -05:00
Blade Barringer 4177202cee Merge pull request #5855 from HabitRPG/sabrecat/party-page
Party Page Revamp
2015-09-06 13:28:14 -05:00