Commit Graph

68 Commits

Author SHA1 Message Date
Alys
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
Sabe Jones
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
Blade Barringer
cb992e1083 Added category to whale quest 2015-07-12 21:16:49 -05:00
Blade Barringer
316c3e9c2e Sort out conflicts from develop 2015-07-12 13:51:42 -05:00
Blade Barringer
b71f68ef32 Merge branch 'develop' into equipment-refactor-merge-into-develop 2015-07-11 15:55:53 -05:00
Blade Barringer
dccc10aa4d Refactor 2015-07-11 15:05:58 -05:00
Sabe Jones
6cc0a08dc2 feat(event): Derby Day pet quest 2015-07-09 12:57:43 -05: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
Sabe Jones
46543f9072 feat(event): Derby Day mount 2015-07-08 16:07:37 -05:00
Sabe Jones
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
sablecliff
c8dd666939 Implemented changes as suggested by @crookedneighbour
Should be passing all tests now.
2015-06-29 18:11:12 +10:00
Alys
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
Alys
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
sablecliff
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
Sabe Jones
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
Sabe Jones
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
Sabe Jones
f6fafc5b6d WIP(event): Summer Splash 2015 2015-06-19 10:42:20 -05:00
Sabe Jones
ad7e5a6dc9 feat(pets): Cuttlefishies 2015-06-17 17:26:36 -05:00
Blade Barringer
ed43bec8cd Allow default tasks to not have notes 2015-06-10 08:49:26 -05:00
Sabe Jones
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
Sabe Jones
6074774e14 feat(backgrounds): June BGs 2015-06-04 11:30:25 -05:00
Sabe Jones
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
Sabe Jones
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
Sabe Jones
c90f7e2c34 feat(Armoire): WIP 2015-06-02 17:42:14 -05:00
Sabe Jones
6af7342693 feat(tour): Revised intro tutorial 2015-05-29 14:03:42 -05:00
Sabe Jones
3098cacf03 feat(subscriber): May Mystery Items 2015-05-25 21:03:13 -05:00
Blade Barringer
1f0dbef3c7 Merge pull request #5234 from hairlessbear/ethereal_surge_split_fix
Fixed Ethereal Surge notification split
2015-05-22 23:23:34 -05:00
SabreCat
13faf8d0c7 feat(pets): Sheep Quest 2015-05-20 20:45:18 -07:00
SabreCat
2b72050827 fix(accessories): Buyback for ears
Fixes #5236.
2015-05-20 13:10:05 -07:00
hairlessbear
fd8fabad43 Fixed Ethereal Surge notification split 2015-05-18 00:45:44 -04:00
Sabe Jones
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
Sabe Jones
00db42b6c0 feat(backgrounds): May BGs 2015-05-06 19:41:54 -05:00
Alys
983d2eb2be Merge remote-tracking branch 'upstream/develop' into rebalancing-2015-03 2015-04-26 16:38:17 +10:00
Alys
77a07c1e53 add official name of each skill as a comment 2015-04-24 16:29:16 +10:00
Sabe Jones
7a7fc96818 feat(mystery): April Subscribee Items 2015-04-21 21:14:19 -05:00
Alys
9292a46b6f Merge remote-tracking branch 'upstream/develop' into rebalancing-2015-03 2015-04-18 18:39:19 +10:00
Sabe Jones
7d1a58ca00 fix(slimes): Tweaks and missing sprite
Slimes don't have skeletons anyway, right?
2015-04-15 18:48:57 -05:00
Sabe Jones
f13c6cba00 feat(pets): Slime Quest 2015-04-15 18:08:43 -05:00
Alys
556a1640c6 Merge remote-tracking branch 'upstream/develop' into rebalancing-2015-03
Conflicts:
	common/dist/scripts/habitrpg-shared.js
	common/script/content.coffee
	common/script/index.coffee
2015-04-09 16:50:10 +10:00
Sabe Jones
616a7d9650 feat(backgrounds): April BGs 2015-04-06 19:03:24 -05:00
Alys
f432bc1f17 Merge pull request #4919 from TheHollidayInn/spells-level-with-exp
Added sync on mage fireball spell and rogue backstab skill and give correct mp reduction notification for ethereal surge
2015-04-04 00:29:41 +10:00
Alys
dcb13a3ed6 Merge remote-tracking branch 'upstream/develop' into rebalancing-2015-03 2015-04-03 11:21:04 +10:00
Sabe Jones
f0e7f0464c fix(seasonal): NO FLOWERS
We do not say the F word here. Strange things happen in Habitica when someone uses that word. We speak only of "the smelly things with the petals."
2015-04-01 23:07:36 -05:00
Sabe Jones
b6a4d65d8c feat(seasonal): Shiny Seed 2015-04-01 22:36:07 -05:00
Alys
5506d5a39e make Tools of the Trade weaker 2015-03-31 20:52:11 +10:00
Alys
605300fdbb make skills that buff their own stat be calculated from the unbuffed stat - affects earth, defensiveStance, valorousPresence, intimidate, toolsOfTrade, protectAura 2015-03-31 03:13:33 +10:00
TheHollidayInn
0ed3937d8f Added exp sync for Backstab 2015-03-30 11:43:06 -05:00
Alice Harris
1432d2a61a Merge remote-tracking branch 'upstream/develop' into rebalancing-2015-03
Conflicts:
	common/dist/scripts/habitrpg-shared.js
	common/script/content.coffee
	common/script/index.coffee
2015-03-28 12:40:46 +10:00
kholliday
258da77586 Added sync on mage fireball spell 2015-03-26 00:18:18 -05:00
Sabe Jones
4f89f68797 fix(mounts): Eggy eggy basket 2015-03-25 22:10:51 -05:00