Commit graph

209 commits

Author SHA1 Message Date
Andy Zinsser
db6f52e4b5 Add muted class when no food is in inventory 2014-12-26 18:31:21 -08:00
Sabe Jones
1b4843ff58 fix(event): Better quest text placement 2014-12-25 17:42:09 -06:00
Sabe Jones
f4c582eb24 fix(event): quest syntax 2014-12-25 17:40:49 -06:00
Sabe Jones
597793e3ca feat(event): Quests and Bailey 2014-12-25 17:36:16 -06:00
Sabe Jones
1c90886548 fix(event): Better shop flow 2014-12-25 15:52:26 -06:00
Sabe Jones
0e28f04c90 feat(event): Implement Seasonal Shop 2014-12-25 14:33:11 -06:00
thehindenburg
1675bb26b2 change link in gala page to gala wiki 2014-12-19 07:47:28 -08:00
Sabe Jones
8ff0a4a4a4 fix(seasonal): Leslie link 2014-12-17 18:27:37 -06:00
Sabe Jones
9f46e14cd6 fix(seasonal): missing bang 2014-12-14 14:18:57 -06:00
Sabe Jones
7988dfcf82 fix(seasonal): Corrections for Shop
Fix Jade indenting, add state control, add menu option
2014-12-14 14:01:25 -06:00
Sabe Jones
a98a685971 feat(seasonal): Seasonal Shop
Initial commit of frontend for Seasonal Shop feature.
2014-12-14 13:37:32 -06:00
Sabe Jones
35b02cfdd8 fix(I18N): Make Time Travel translatable 2014-12-14 12:59:45 -06:00
Sabe Jones
dc034e4ab5 fix(quest): Add penguin to shop 2014-12-09 20:48:08 -06:00
Andy Mantell
58359f1e89 Link for Tyler and Vicky's names #4351 2014-12-06 15:42:12 +00:00
Blade Barringer
ae62a04497 Converted planId to customerId on whether or not gems can be purchased.
Closes #4340
2014-12-05 15:53:53 -06:00
Matteo Pagliazzi
0450e2b924 Revert "Revert "Tranlsate mystic items"" 2014-12-05 16:07:27 +01:00
Matteo Pagliazzi
1d1de38956 Revert "Tranlsate mystic items" 2014-12-05 16:03:41 +01:00
Matteo Pagliazzi
a1075a5193 Merge pull request #4329 from crookedneighbor/tranlsate-mystic-items
Tranlsate mystic items
2014-12-05 16:02:34 +01:00
Sabe Jones
7dd16a06e6 Revert "fix(style): Make pet key a SPAN"
This reverts commit 63ea851fdb.
2014-12-04 20:26:50 -06:00
Sabe Jones
63ea851fdb fix(style): Make pet key a SPAN 2014-12-04 20:13:26 -06:00
Blade Barringer
5986643f1e Corrected strings so they only use one variable 2014-12-04 20:03:31 -06:00
Blade Barringer
532f5d1c53 Converted strings to be able to use links 2014-12-04 19:49:36 -06:00
Blade Barringer
21ca49345d Moved time travelers and hourglass strings to shared 2014-12-04 19:49:36 -06:00
Sabe Jones
f2c6c07ff8 fix(Gems): Clarify badge count 2014-12-04 19:04:47 -06:00
Blade Barringer
efcf9099f4 Adjusted count for remaining gem count 2014-12-04 18:47:28 -06:00
Sabe Jones
b017623621 fix(subscriptions): Fix to Gems badge 2014-12-03 21:39:26 -06:00
Sabe Jones
62e526f8dc feat(subscriptions): Show count of purchasable Gems 2014-12-03 20:55:22 -06:00
Tyler Renelle
8c5842eb52 feat(plans): cleanup plans' perks page, rename Time Trinket => Mystic Hourglass 2014-12-03 14:17:08 -07:00
Tyler Renelle
0fffd66588 feat(plans): time travelers tab, 1 trinket to buy 1 set 2014-12-03 14:17:08 -07:00
Alice Harris
9bc38b0b2e Merge pull request #4287 from taldin/market-poptop
Market poptop fix
2014-12-01 17:58:12 +10:00
Tyler Renelle
96f8f2cdd5 refactor(inventory): move all special items into single category
"special" (cleaner)
2014-11-30 13:12:28 -07:00
Tyler Renelle
3204418af1 Revert #4291
This reverts commit a1ea6869b7.
2014-11-29 09:16:44 -07:00
Steffen Breiler
64a76566a0 Fix #4259 (always 100% long bars in IE11)
Fix issue with IE11 displaying Bars with full length (style: width is ignored) by using ng-style instead of plain style.
2014-11-27 22:52:03 +01:00
Taldin
212868010c bugfix: all-market-poptop breaks on the left side
Right side popovers have been switched to 'top', but left side popovers
need to remain 'right'.
2014-11-26 14:17:42 -08:00
Taldin
4a6cd9c2f3 Fixes market to have popover-placement="top'
Market fixed to have popover-placement="top' instead of 'left', which
was causing some problems, and 'right' for consistency.
2014-11-26 14:03:31 -08:00
Matteo Pagliazzi
c0a3fc887a fix(costume): better fix for #4274 2014-11-26 12:26:41 +01:00
Matteo Pagliazzi
43fa461a67 fix(costume): fixes #4274 2014-11-26 12:19:33 +01:00
Tyler Renelle
d24ece973b fix(food): popover-placement='top' in foodtray, fixes #4278 2014-11-25 15:26:42 -07:00
Sabe Jones
bf8882e8f5 feat(quest): Add owl to purchasable quest eggs 2014-11-18 19:37:57 -06:00
Alice Harris
f80da293ce fix bug that was causing empty pet paws to appear for rare mounts 2014-11-10 06:00:01 +10:00
Tyler Renelle
89060c9561 feat(fall): turn off fall hair, skins, spookySparkles 2014-11-01 13:25:09 -06:00
Alice Harris
0963f0fc0a Merge pull request #4114 from Alys/lynnyliz-develop
changes made by lynnyliz to reorganise the mounts page (with fixes for merge conflicts, etc)
2014-11-01 10:25:38 +10:00
Tyler Renelle
39ab41549a feat(quests): spider quest 2014-10-12 19:29:51 -06:00
Alice Harris
8a1973ae2f fix bug where quest Pets were being used instead of quest Mounts 2014-10-06 13:20:01 +10:00
Alice Harris
0c377343d5 fix bug where dropEggs were used for both types of mounts (instead of 'source') 2014-10-06 13:18:39 +10:00
Alice Harris
d24b4ad141 add fix for hiding Plain Eggs on mounts page 2014-10-06 11:37:40 +10:00
Alice Harris
ecd61ee602 Merge branch 'develop' of https://github.com/lynnyliz/habitrpg into lynnyliz-develop
Conflicts:
	views/options/inventory/stable.jade
2014-10-06 11:36:32 +10:00
Tyler Renelle
0841cafd1f feat(spookDust): add the spookDust special spell, like snowballs. Note: this is handled specially so spookDust can be bought with GP, is a WIP 2014-10-02 23:18:13 -06:00
Alice Harris
ee325ce27f Merge pull request #4093 from deilann/release_pets
feat(pets): release pets
2014-10-01 06:35:36 +10:00
deilann
8427c53d90 release pets feature 2014-09-29 13:35:38 -07:00