Commit graph

28 commits

Author SHA1 Message Date
Sabe Jones
41b3ee1df0 fix(world-boss): Correct generic Tavern text 2016-03-31 23:45:34 -05:00
Sabe Jones
1ad6ffd35d Merge branch 'develop' into sabrecat/more-modals 2015-10-20 12:50:34 -04:00
Sabe Jones
380265731f feat(world-boss): Exhaust Ian's text 2015-10-14 21:02:59 -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
4044b0cb64 fix(world-boss): Update mechanics explanation 2015-10-08 18:48:13 -04:00
Sabe Jones
58801f5025 fix(world-boss): Don't repeat explanation 2015-10-08 13:17:49 -04:00
Sabe Jones
6d6f0f597b feat(world-boss): Dry run 2015-09-24 15:39:16 -04:00
Blade Barringer
bc24fa8130 Add front end button to leave quest 2015-08-23 22:38:55 -05:00
Blade Barringer
fd35f58ccd Display invite party to quest only if party has more than one member 2015-08-23 08:29:45 -05:00
Blade Barringer
59a2d2b2f0 Improve quest modal appearance 2015-08-23 08:22:34 -05:00
Blade Barringer
e4f2a1a699 Adjust text 2015-08-23 07:59:40 -05:00
Sabe Jones
28ae6afd92 WIP(party-page): UI draft 2015-08-10 13:42:36 -05:00
Sabe Jones
f1704a6a92 WIP(party-page): Active party page 2015-08-06 12:13:50 -05:00
Sabe Jones
ffc441ab82 feat(quests): Improve drop notif 2015-07-16 16:22:49 -05:00
Sabe Jones
2407c9eeb8 feat(quests): Improve buy confirm dialog 2015-07-16 12:56:26 -05:00
Alys
9ccab259b0 add message to Inventory/Market (drops) page to explain where quests have gone 2015-07-15 13:29:03 +10:00
Sabe Jones
78d4989544 WIP(event): Summer Splash cont'd
Splits Quests out to a new page. Refactors inventory Jade files and controllers to more manageable structures.
2015-07-08 16:13:23 -05:00
Blade Barringer
a6e0d5f2de Merge branch 'develop' into hairlessbear-pending_quest_display 2015-06-14 08:44:25 -05:00
agentx999
ef6fa13943 removed mention of "options" menu 2015-06-09 10:55:30 -07:00
agentx999
2843d1d278 boss damage text 2015-05-27 16:12:37 -07:00
hairlessbear
05f9167b3f Changed 'invites' to 'invitations' 2015-05-17 22:32:06 -04:00
hairlessbear
905c4e8273 Added tabbed display to quest in progress, added profile links, changed button behavior 2015-05-15 23:28:01 -04:00
Blade Barringer
d7ce151500 Add translatable strings 2015-05-14 21:56:16 -05:00
Blade Barringer
fc979dfdaa create new string for quest participants to correct processing error
closes #5025, closes #5029
2015-04-14 17:52:08 -05:00
Sabe Jones
4c5f4377ff fix(quests): Alternate unlock strings 2015-03-17 21:48:22 -05:00
Sabe Jones
4cb6783544 feat(quest): Bunny quest 2015-03-17 21:24:46 -05:00
Blade Barringer
88be8f3274 Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert
Conflicts:
	common/img/sprites/spritesmith/misc/inventory_quest_scroll_penguin.png
	common/img/sprites/spritesmith/npcs/npc_bailey_broken.png
	common/img/sprites/spritesmith/npcs/npc_justin_broken.png
	common/img/sprites/spritesmith/npcs/npc_matt_broken.png
	img/sprites/spritesmith/gear/events/birthday/broad_armor_special_birthday2015.png
	img/sprites/spritesmith/gear/events/birthday/shop_armor_special_birthday2015.png
	img/sprites/spritesmith/misc/inventory_quest_scroll_penguin.png
	img/sprites/spritesmith/npcs/npc_bailey_broken.png
	img/sprites/spritesmith/npcs/npc_justin_broken.png
	img/sprites/spritesmith/quests/inventory_quest_scroll_penguin.png
2015-02-01 14:07:18 -06:00
Blade Barringer
c91b0cd34a Moved folders into common directory 2015-01-21 10:34:04 -06:00
Renamed from locales/en/quests.json (Browse further)