65888d3f8a
Merge branch 'develop' into sabrecat/party-page
2015-08-20 07:39:25 -05:00
190fdd5bb9
feat(pets): August cheetah quest
2015-08-19 16:55:14 -04:00
f792155b45
Order quests with array
2015-08-17 21:48:58 -05:00
344eded949
Merge branch 'develop' into sabrecat/party-page
2015-08-17 19:04:25 -05:00
7f0889f405
remove commented-out default task code and unused default task locale strings - fixes https://github.com/HabitRPG/habitrpg/issues/5631#issuecomment-130619901 (comment by GitHubSphinx)
2015-08-15 13:23:42 +10:00
0f31873262
Merge branch 'develop' into sabrecat/party-page
...
Conflicts:
common/dist/sprites/habitrpg-shared.css
common/dist/sprites/spritesmith1.css
common/dist/sprites/spritesmith1.png
common/dist/sprites/spritesmith4.css
common/dist/sprites/spritesmith4.png
website/views/options/social/index.jade
2015-08-14 11:23:35 -05:00
6be339fc77
Fix bug where armoire notes would not display correctly
2015-08-14 06:59:23 -05:00
576688c15b
Clean up content file
2015-08-14 06:41:10 -05:00
00a212660a
feat(greeting-cards): Thank-You & Greets
2015-08-13 16:58:31 -05:00
f57e3e69a1
WIP(greeting-cards): Working send + modals
2015-08-13 15:43:51 -05:00
b2100c2c54
WIP(greeting-cards): Abandon spell refactor
2015-08-13 14:31:34 -05:00
28ae6afd92
WIP(party-page): UI draft
2015-08-10 13:42:36 -05:00
60e65a8bea
feat(armoire): August additions
...
Also includes the August backgrounds and upgrades the "restock Armoire" migration to use @Alys's progressive output script.
2015-08-04 12:45:01 -05:00
ceb9cf7817
WIP(event): Habitica Day
2015-07-28 16:20:08 -05:00
d32d05e873
feat(mystery): July 2015 goodies
...
Also makes the mystery box opening notification translatable and adds item graphics to it.
2015-07-23 12:05:13 -05:00
d8e7108098
moved twoHanded:true out of bracketed region in rancherLasso - it was causing "Error processing the string"
2015-07-15 14:56:57 +10:00
b9f795529b
feat(quests): Dilatory Distress
...
Implements the "Dilatory Distress" quest chain, purchasable for Gold. Also adds four new items to the Enchanted Armoire.
2015-07-13 18:21:32 -05:00
cb992e1083
Added category to whale quest
2015-07-12 21:16:49 -05:00
316c3e9c2e
Sort out conflicts from develop
2015-07-12 13:51:42 -05:00
b71f68ef32
Merge branch 'develop' into equipment-refactor-merge-into-develop
2015-07-11 15:55:53 -05:00
dccc10aa4d
Refactor
2015-07-11 15:05:58 -05:00
6cc0a08dc2
feat(event): Derby Day pet quest
2015-07-09 12:57:43 -05:00
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
46543f9072
feat(event): Derby Day mount
2015-07-08 16:07:37 -05:00
25dd82ffa0
feat(event): Summer Splash cont'd
...
Summer backgrounds, the Seafoam transformation item, and announcements for same.
2015-07-01 13:11:53 -05:00
c8dd666939
Implemented changes as suggested by @crookedneighbour
...
Should be passing all tests now.
2015-06-29 18:11:12 +10:00
eceae75631
Merge pull request #5482 from Alys/startDate-fix-2015-06-25
...
Refactor api.shouldDo and fix https://github.com/HabitRPG/habitrpg/issues/5395
2015-06-28 07:31:04 +10:00
d7a203ccc2
set all daily repeat code and tests to use true/false instead of 1/0 for consistency with DailySchema; comment-out unused default Daily repeat code
2015-06-27 20:06:04 +10:00
96a3653620
Now includes the refactoring into different files.
...
Currently there a multiple ways to create the string being shown.
This will be changed upon the decision of which is prefered.
I personally prefer the first method, which uses a function inside the
object being created in content.coffee
2015-06-26 19:33:39 +10:00
775f903c3d
feat(events): Limited edition
...
Summer Splash skins and June mystery item. Also announces the Gokul sound theme.
2015-06-25 11:19:01 -05:00
3641bea441
feat(event): Summer Splash 2015
...
Summer seasonal event for 2015, including festive NPC graphics, the summer edition of the Seasonal Shop, and new class equipment available in Rewards.
2015-06-20 23:07:14 -05:00
f6fafc5b6d
WIP(event): Summer Splash 2015
2015-06-19 10:42:20 -05:00
ad7e5a6dc9
feat(pets): Cuttlefishies
2015-06-17 17:26:36 -05:00
ed43bec8cd
Allow default tasks to not have notes
2015-06-10 08:49:26 -05:00
95bb5be22a
Merge branch 'develop' into armoire
...
Conflicts:
common/dist/sprites/habitrpg-shared.css
common/dist/sprites/spritesmith0.css
common/dist/sprites/spritesmith0.png
common/dist/sprites/spritesmith1.css
common/dist/sprites/spritesmith1.png
common/dist/sprites/spritesmith2.css
common/dist/sprites/spritesmith2.png
common/dist/sprites/spritesmith3.css
common/dist/sprites/spritesmith3.png
common/dist/sprites/spritesmith4.css
common/dist/sprites/spritesmith4.png
common/dist/sprites/spritesmith5.css
common/dist/sprites/spritesmith5.png
common/dist/sprites/spritesmith6.css
common/dist/sprites/spritesmith6.png
2015-06-04 15:49:06 -05:00
6074774e14
feat(backgrounds): June BGs
2015-06-04 11:30:25 -05:00
09d32390f9
feat(Armoire): Item counter
...
Implements a counter for how many pieces of equipment remain to be found in the Armoire, including tests for same.
2015-06-03 16:48:11 -05:00
97ae243c40
fix(Armoire): Fixes
...
Armoire items are now breakable on character death, and can be purchased back directly from Rewards after death or Rebirth. Corrected string token on Costume area. Images show up correctly on Armoire drop notifications.
2015-06-03 12:50:57 -05:00
c90f7e2c34
feat(Armoire): WIP
2015-06-02 17:42:14 -05:00
6af7342693
feat(tour): Revised intro tutorial
2015-05-29 14:03:42 -05:00
3098cacf03
feat(subscriber): May Mystery Items
2015-05-25 21:03:13 -05:00
1f0dbef3c7
Merge pull request #5234 from hairlessbear/ethereal_surge_split_fix
...
Fixed Ethereal Surge notification split
2015-05-22 23:23:34 -05:00
13faf8d0c7
feat(pets): Sheep Quest
2015-05-20 20:45:18 -07:00
2b72050827
fix(accessories): Buyback for ears
...
Fixes #5236 .
2015-05-20 13:10:05 -07:00
fd8fabad43
Fixed Ethereal Surge notification split
2015-05-18 00:45:44 -04:00
29109051d7
feat(customize): Animal skins and ears
...
Implements a base-pet-themed set of avatar skins and head accessories, the latter of which has additional handling for the user to purchase them from the Avatar Customization page.
2015-05-13 11:19:08 -05:00
00db42b6c0
feat(backgrounds): May BGs
2015-05-06 19:41:54 -05:00
983d2eb2be
Merge remote-tracking branch 'upstream/develop' into rebalancing-2015-03
2015-04-26 16:38:17 +10:00
77a07c1e53
add official name of each skill as a comment
2015-04-24 16:29:16 +10:00
7a7fc96818
feat(mystery): April Subscribee Items
2015-04-21 21:14:19 -05:00
Blade Barringer