Commit Graph

30 Commits

Author SHA1 Message Date
Sabe Jones f13c6cba00 feat(pets): Slime Quest 2015-04-15 18:08:43 -05:00
Alys 6296a2f4df Merge pull request #4969 from Alys/explain-drops-2015-03-04
add text to Market for eggs, etc to explain to new users that the items will also drop
2015-04-14 18:22:47 +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 43fdf939cc add text to the Market for eggs, hatching potions, and food to explain to new users that the items will also drop 2015-04-03 23:00:15 +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
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
Sabe Jones 63d6a43702 fix(pets): Eggy eggy progress bar 2015-03-25 22:03:46 -05:00
Sabe Jones 77cc05a668 fix(pets): Eggy eggy feed 2015-03-25 22:01:42 -05:00
Sabe Jones b24dbe9b86 feat(March): Eggy eggy mystery 2015-03-25 19:53:07 -05:00
Sabe Jones dac292114c fix(shop): Open Shop 2015-03-20 15:15:27 -05:00
Sabe Jones bd0d4c8b21 fix(shop): Remove br 2015-03-20 15:09:55 -05:00
Sabe Jones 621e5ba7d7 fix(shop): Indent +1 2015-03-20 15:07:12 -05:00
Sabe Jones f3f5669ab2 feat(spring): Fling 2015-03-20 14:56:00 -05:00
Sabe Jones 4cb6783544 feat(quest): Bunny quest 2015-03-17 21:24:46 -05:00
Alys 59f64830b1 Merge pull request #4799 from TheHollidayInn/add-dequip-button
Added dequip ability per ticket: 3730
2015-03-14 21:36:57 +10:00
kholliday fc3e1c6c9b Added ability to remove pet, mount, and background. Also, changed text for all dequip buttons. 2015-03-08 15:35:37 -05:00
kholliday cfaedb3ebd Added bootstrap styles to button. 2015-03-05 12:11:42 -06:00
kholliday 11f61c2732 Add functionality to dequip all Battle Gear or Cosutme. 2015-03-05 09:40:37 -06:00
Blade Barringer cdc8ff6000 Changed quest egg behavior closes #4792 2015-03-04 23:46:27 -06:00
Blade Barringer f44c3b84ab Revert "Changed requirement to only need to complete one quest instead of two to"
This reverts commit f8bdaf4c99.
2015-03-04 23:43:27 -06:00
Blade Barringer f8bdaf4c99 Changed requirement to only need to complete one quest instead of two to
buy eggs
2015-03-04 23:39:29 -06:00
kholliday f28bc31a2c Added dequip ability per ticket: 3730 2015-03-04 21:43:17 -06:00
Blade Barringer 33bd640bdb Fixes #3054 won't show pets as able to be fed if egg has noMount propery 2015-02-24 19:10:45 -06:00
Sabe Jones 0608ac5caa feat(quest): Pet Rocks 2015-02-17 20:02:06 -06:00
Sabe Jones 130261dacf feat(event): End Valentine's 2015-02-16 18:15:09 -06:00
Blade Barringer 477d3d6085 Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert 2015-02-12 13:32:23 -06:00
Blade Barringer cc767efa20 Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert
Conflicts:
	src/controllers/auth.js
	src/controllers/challenges.js
	src/controllers/groups.js
	src/controllers/members.js
	src/controllers/payments/index.js
	src/controllers/user.js
	src/middleware.js
	src/models/user.js
2015-02-03 21:13:55 -06:00
Blade Barringer 8a8ce8d80d Moved folders to website directory 2015-02-03 14:10:55 -06:00