39380507e7
fix(Market): Move Saddle back with food
...
Moves Saddle out of the Special category of the Market into the "Food and Saddles" group, to match up with the label and grouping used elsewhere.
Fixes #2937
2014-02-25 19:23:57 -06:00
13094c127a
feat(premium): unlock mystery items within timeframe of sub sign-on
2014-02-22 21:43:44 -08:00
91d8ebad6d
feat(premium): add mystery-item gear slot
2014-02-22 20:38:16 -08:00
35a997c690
Merge pull request #2917 from benmanley/stable-styles
...
Move CSS for pets that have been raised into mounts from stable.jade to inventory.styl
2014-02-22 15:25:01 +01:00
a8e890a6df
feat(premium): mystery items
2014-02-21 17:37:37 -08:00
8c2c940d88
Move styles from stable.jade to inventory.styl file
2014-02-21 12:49:46 +00:00
c04caefaac
Fix positioning of paw sprites
2014-02-21 12:49:46 +00:00
dc75834ec4
Changed hints style (and small quick fixes)
2014-02-16 10:13:16 -05:00
fd6eb8724e
feat(valentine): valentine event
2014-02-13 18:40:33 -07:00
fa2c64d2d8
chore(i18n): prepare english for transifex: remove ending or starting space & _comment strings
2014-02-11 19:30:55 +01:00
1a44c3cf0c
refactor(bs3): css
2014-02-09 16:16:43 +01:00
5874941b94
refactor(bs3): inventory & misc
2014-02-09 12:32:12 +01:00
322b257b72
Separated stable into dropped pets, quest pets, and rare pets, and made countPets only count the former. Made countMounts only count dropped and quest-hatched mounts, not rare mounts.
2014-02-08 16:57:28 -08:00
5db96ebca2
fix(bs3): port pet feeding bar
2014-02-07 21:57:26 -07:00
3473b73452
chore(Merge): branch 'develop' into bs3
...
Conflicts:
views/options/inventory/inventory.jade
2014-02-07 17:42:12 -07:00
d034262834
feat(premium): subscriber mystery item (doesn't yet do anything)
2014-02-07 11:40:34 -07:00
5d4d82ad51
refactor(bs3): port options (profile, inventory, social (groups and hall)) and misc
2014-02-05 19:05:42 +01:00
b89081dd41
refactor(bs3): misc fixes
2014-02-04 20:18:27 +01:00
685b7a3cd2
Merge branch 'develop' into paglias/bs3
2014-02-04 20:16:00 +01:00
07a47d353d
Merge pull request #2666 from marcgenesis/develop
...
Fixed inventory alignment. Issue #2158
2014-02-04 11:00:52 -08:00
56133894d8
refactor(bs3): sync with develop
2014-02-03 18:45:25 +01:00
2e3ee3f97c
removes progress bar of unfeedable pets
2014-02-02 13:22:24 -08:00
3e077fea6d
refactor(bs3): port rebirth and reroll modals, misc fixes
2014-02-02 13:52:42 +01:00
527f230ee5
Merge pull request #2701 from deilann/wizardtomage
...
Change "Wizard" to "Mage" in member modal & inventory
2014-02-01 16:21:32 -08:00
dafd015173
wizard to mage in inventory
2014-02-01 15:20:02 -08:00
0afaa69d7d
Created new CSS entry for equipment title and modified inventory.jade accordingly
2014-02-01 13:17:21 -05:00
875698c111
Created new CSS entry for equipment-title and modified inventory.jade accordingly
2014-02-01 12:52:38 -05:00
52f8f0d5b0
feat(winter): remove winter scrolls & snowballs
2014-02-01 07:43:25 -08:00
800231cf64
feat(quests): allow html in quest notes
2014-01-31 15:06:56 -07:00
aff885c05c
feat(habitBirthday): add habitrpg birthday event. includes cakes for all
...
pets, absurd party robes, npc swap, badge, etc. @lemoness
2014-01-30 19:20:07 -07:00
2e64b03a63
Fixed inventory alignment. Issue #2158
2014-01-30 19:58:34 -05:00
49ec9d2e5c
Fixed inventory alignment. Issue #2158
2014-01-30 19:57:50 -05:00
44d9ea2a15
i18n(interpolation): Add string interpolation
2014-01-30 18:25:25 -02:00
2b17b041ca
Merge pull request #2533 from Sinza-/buy-quest
...
Add information to quests on the Market before you buy them
2014-01-28 18:49:29 -08:00
9226b83d84
Merge pull request #2591 from Alys/patch-2
...
Market "Sell..." button: add spaces, remove bracket
2014-01-28 10:48:54 -08:00
2e18f0eb82
feat(premium): backport client-side premium code to public repo, it's
...
client-side anyway (@colegleason @paglias)
2014-01-27 16:34:22 -08:00
a0dad56a9b
Market "Sell..." button: add spaces, remove bracket
...
Fix some text appearance issues:
- Use item.text instead of item.key so that users see "Tiger Cub" rather than "TigerCub".
- Remove unwanted ) from end of gold value so that users see "3 Gold" instead of "3) Gold". Bracket had been left over from the end of the old env.t(...) function call - see https://github.com/HabitRPG/habitrpg/commit/4f07ab39b0868764c665bbf914474745e11ecc32
- Add spaces between words so that users see "Sell Fox for 3 Gold" instead of "SellFoxfor3Gold". There are other shorter/neater ways to insert those spaces, but making them really obvious with nbsp is probably the best way to ensure they don't get accidentally removed again.
2014-01-27 19:27:06 +10:00
51bff23885
fix(stable): show hatchable combo when petOwned>0 (fyi @deilann)
2014-01-26 17:46:09 -08:00
5caaff1cea
fix(beastmaster): fixes #2557 , adds opacity to previously-owned pets
...
after they're mounted. You can earn them back again
2014-01-26 17:24:48 -08:00
17c63cdc6e
Replace string for env.t
2014-01-24 20:26:33 -02:00
d107db7013
refactor(translations)
2014-01-24 21:27:06 +01:00
d3d970b87f
Make locked quests purchasable
2014-01-23 23:11:30 -02:00
9e6a9a3d0e
Don't show information if the quest is locked
2014-01-23 18:26:55 -02:00
6c68c51ab5
Fix version conflict
2014-01-23 17:26:37 -02:00
b2d5e2a090
Add popover quest description to quests in the Market and add buyQuest modal to show text and rewards before purchasing the quest
2014-01-23 15:53:42 -02:00
13a7cc9d55
improve(translations): merge pr and lots of fixes
2014-01-23 17:02:16 +01:00
a6c67f1781
fix(translations): merge @luveluen pull request, fix some syntax
2014-01-22 16:09:32 +01:00
4f07ab39b0
Update inventory.jade
2014-01-22 12:10:51 +01:00
f16654d235
feat(quests): add canBuy so we can exclude certain items from the
...
market (if you can only find them on quest-drop, etc). This isn't the
prettiest, change?
2014-01-21 14:44:53 -08:00
8b97438607
Update stable.jade
2014-01-20 19:44:33 +01:00
Sabe Jones