Commit Graph

101 Commits

Author SHA1 Message Date
Sabe Jones
af3ee8cfcd feat(Armoire): Updates from feedback
Adds images to Armoire drop notifications, refreshes the Rewards column when the Armoire is enabled, adds Armoire items to Costume customization, and introduces a migration for granting the new style Ultimate Gear achievement to those who have already earned it.
2015-06-03 11:58:30 -05:00
Sabe Jones
c90f7e2c34 feat(Armoire): WIP 2015-06-02 17:42:14 -05:00
Sabe Jones
766f3b6057 Merge pull request #5307 from HabitRPG/tutorial
Tutorial overhaul
2015-05-31 13:58:12 -07:00
Blade Barringer
719ae1c89d Add missing ?; common tests pass 2015-05-30 23:10:44 -05:00
Sabe Jones
726a8f1acb feat(analytics): Mixpanel implementation WIP 2015-05-29 16:22:35 -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
Blade Barringer
bd76b762e6 Merge pull request #5212 from HabitRPG/negue-WIP-Push-notifications
Negue wip push notifications
2015-05-18 11:14:53 -05:00
hairlessbear
fd8fabad43 Fixed Ethereal Surge notification split 2015-05-18 00:45:44 -04:00
Sabe Jones
84b333e5c1 fix(unlocks): Handle undefined/null balance 2015-05-13 15:34:23 -05:00
Sabe Jones
6e27b7af9d fix(purchases): Handle undefined/null balance 2015-05-13 15:15:40 -05:00
Sabe Jones
35ff90b4d3 Merge remote-tracking branch 'origin/new_inn_behavior_PR' into pet-skins 2015-05-13 12:12:57 -05: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
Blade Barringer
dca45d7845 Enable new inn behavior 2015-05-13 08:44:08 -05:00
Negue
1cc07129f1 Merge branch 'develop' into pushNotifications2
Conflicts:
	test/api.mocha.coffee
2015-05-10 22:01:41 +02:00
Alys
1dec4ba7a6 allow MP gained for Habits and Dailies to be increased when a critical hit occurs (crits are triggered in addPoints) 2015-05-10 18:17:17 +10:00
Negue
90edb7719f Merge branch 'develop' into pushNotifications2 2015-05-08 23:21:18 +02:00
Sabe Jones
00db42b6c0 feat(backgrounds): May BGs 2015-05-06 19:41:54 -05:00
Blade Barringer
e09d4f3a91 Commented out new dailies behavior 2015-05-03 08:21:29 -05:00
Blade Barringer
68aedda3bb Merge branch 'develop' into hairlessbear-cron_dailies_fix 2015-05-02 22:10:58 -05:00
Blade Barringer
c81d321366 Checklists should reset even when resting in the inn 2015-05-02 22:10:26 -05:00
Negue
02781d1f33 remove markModified in addPushDevice 2015-04-28 19:55:01 +02:00
Negue
b23e901780 Merge branch 'develop' into pushNotifications2 2015-04-27 17:20:25 +02:00
Alys
983d2eb2be Merge remote-tracking branch 'upstream/develop' into rebalancing-2015-03 2015-04-26 16:38:17 +10:00
hairlessbear
e9e0ff52e4 Update index.coffee 2015-04-24 04:32:47 -04:00
hairlessbear
de8facd58e Dailies reset without causing damage when resting at Inn 2015-04-24 04:07:51 -04: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
Tyler Renelle
fee002b289 feat(analytics): better events organization via category>label>action>value 2015-04-08 17:29:55 -06:00
Sabe Jones
616a7d9650 feat(backgrounds): April BGs 2015-04-06 19:03:24 -05:00
Alys
e134c36ca2 prevent user.stats.points from being negative e.g., after dropping level with Fix Character Values (still need to remove allocated points then) 2015-04-05 09:04:59 +10:00
Alys
8033b129ff Merge pull request #4915 from gisikw/free_100_key_to_the_kennels
Make Key to the Kennels free for Triad Bingoers.
2015-04-04 10:48:15 +10: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
Negue
7105bc195f add all Changes of #4565 2015-03-27 18:35:32 +01:00
Kevin Gisi
ca87a46b04 Adjusted Key to the Kennel logic so only *release both* is free with Triad Bingo achievement 2015-03-26 18:30:56 -04:00
Kevin Gisi
334393d33b Make Key to the Kennels free for Triad Bingoers.
* Updated logic in `common/script/index.coffee` to accept Triad Bingo
  achievement in lieu of gems.

* Removed Gem cost on inventory page if user has achievement.

* Updated Key to the Kennels modal to hide "Buy Gems" button if user has
  achievement.

* Removed Gem costs from buttons if user has achievement.

* Added new copy for Key to the Kennels modal that omits gem prices if the user
  has the achievement.
2015-03-26 18:30:56 -04:00