Commit Graph

53 Commits

Author SHA1 Message Date
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
Sabe Jones
b24dbe9b86 feat(March): Eggy eggy mystery 2015-03-25 19:53:07 -05:00
Sabe Jones
f3f5669ab2 feat(spring): Fling 2015-03-20 14:56:00 -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
Alice Harris
2f072d8e96 Merge branch 'StealthMod' of https://github.com/Verabird/habitrpg into rebalancing-2015-03-2
Conflicts:
	common/script/index.coffee
2015-03-14 18:54:18 +10:00
Verabird
627b07ef86 Rebalance stealth diminishing returns again 2015-03-13 16:45:00 -04:00
Verabird
fbeb83e836 Rescale stealth to strengthen 2015-03-13 11:38:34 -04:00
Verabird
4a0f165af8 Modify daily checklists to stay checked at cron if inactive and Stealth to only apply to active dailys 2015-03-13 10:53:29 -04:00
Alice Harris
6cf815ba22 Merge remote-tracking branch 'upstream/develop' into rebalancing-2015-03
Conflicts:
	common/dist/scripts/habitrpg-shared.js
2015-03-13 20:23:28 +10:00
Tyler Renelle
812493fec5 feat(tour): Refactor the Justin Guide to be much more streamlined and interactive. Backdrop focuses user on present task. Chapterized guides 2015-03-10 15:40:18 -06:00
Blade Barringer
c23730fdbf Merge branch 'develop' of github.com:HabitRPG/habitrpg into rebalancing 2015-03-06 07:47:10 -06:00
Sabe Jones
21fd8061cf feat(backgrounds): March BGs 2015-03-03 21:42:15 -06:00
Sabe Jones
d4f8acd0ef feat(mystery): February 2015 2015-02-24 20:15:31 -06:00
Sabe Jones
0608ac5caa feat(quest): Pet Rocks 2015-02-17 20:02:06 -06:00
Blade Barringer
9ddb5e35fb Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert
Conflicts:
	common/dist/scripts/habitrpg-shared.js
	common/dist/sprites/habitrpg-shared.css
	common/img/sprites/spritesmith/customize/hair/hair_base_10_TRUEred.png
	common/img/sprites/spritesmith/customize/hair/hair_base_11_TRUEred.png
	common/img/sprites/spritesmith/customize/hair/hair_base_12_TRUEred.png
	common/img/sprites/spritesmith/customize/hair/hair_base_13_TRUEred.png
	common/img/sprites/spritesmith/customize/hair/hair_base_14_TRUEred.png
	common/img/sprites/spritesmith/customize/hair/hair_base_9_TRUEred.png
	img/sprites/spritesmith/customize/hair/hair_base_10_TRUEred.png
	img/sprites/spritesmith/customize/hair/hair_base_10_TRUred.png
	img/sprites/spritesmith/customize/hair/hair_base_11_TRUEred.png
	img/sprites/spritesmith/customize/hair/hair_base_11_TRUred.png
	img/sprites/spritesmith/customize/hair/hair_base_12_TRUEred.png
	img/sprites/spritesmith/customize/hair/hair_base_12_TRUred.png
	img/sprites/spritesmith/customize/hair/hair_base_13_TRUEred.png
	img/sprites/spritesmith/customize/hair/hair_base_13_TRUred.png
	img/sprites/spritesmith/customize/hair/hair_base_14_TRUEred.png
	img/sprites/spritesmith/customize/hair/hair_base_14_TRUred.png
	img/sprites/spritesmith/customize/hair/hair_base_9_TRUEred.png
	img/sprites/spritesmith/customize/hair/hair_base_9_TRUred.png
2015-02-12 13:42:11 -06:00