sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-08-05 03:52:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
8169 commits 3 branches 0 tags 1.6 GiB
Commit graph

179 commits

Author SHA1 Message Date
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
benmanley
50b1cba0a6 refactor(tasks) improve UI consistency 
* Round corners for UI elements / “8-bit” outlines for RPG elements.
* Tag bar – Make it clearer that “Tags” is a heading, not an option
* Task filters – restyle in line with tag bar + nav menu
 2014-11-27 10:32:57 +00: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
Sabe Jones
bf8882e8f5 feat(quest): Add owl to purchasable quest eggs 2014-11-18 19:37:57 -06:00
Tyler Renelle
89060c9561 feat(fall): turn off fall hair, skins, spookySparkles 2014-11-01 13:25:09 -06:00
Tyler Renelle
39ab41549a feat(quests): spider quest 2014-10-12 19:29:51 -06: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
Tyler Renelle
94e1d48588 feat(quests): add rooster rampage quest 2014-09-16 16:08:35 -06:00
Tyler Renelle
a88fde9862 feat(quests): parrot quest 2014-08-18 19:04:31 -06:00
Tyler Renelle
c66c5ec83b feat(quests): seahorse quest 2014-07-07 15:02:19 -06:00
Tyler Renelle
d6d2be9a00 perf(inventory): bindonce for inventory listings, #3486 2014-07-01 12:42:26 -06:00
Tyler Renelle
9f1035c317 feat(dilatory): scene damage + boss def/str. bug fixes, tests 2014-06-25 14:12:30 -06:00
Tyler Renelle
f85d6b2978 feat(quests): add octopus quest 2014-06-09 14:33:08 -06:00
Tyler Renelle
598c6a43f1 refactor(quests): cleaner buyable quest eggs html 2014-05-14 10:09:18 -06:00
Tyler Renelle
8506db9849 feat(rat): add rat quest 2014-05-14 08:54:24 -06:00
deilann
d801ece19d adding flag, allowing free rebirth purchase, adding modal 2014-05-11 08:01:15 -07:00
Matteo Pagliazzi
dce4dd3ad6 fix(i18n): translate class names in equipment 2014-05-06 20:05:57 +02:00
Matteo Pagliazzi
95d5759042 fix(i18n): use right strings 2014-05-06 20:04:10 +02:00
Matteo Pagliazzi
1f8722cb57 fix(i18n): use strings 2014-05-06 20:04:10 +02:00
Matteo Pagliazzi
6930b693e0 fix(i18n): better strings for items 2014-05-06 20:04:09 +02:00
Matteo Pagliazzi
21efe44d4d fix(i18n): use strings 2014-05-06 20:04:09 +02:00
Matteo Pagliazzi
d242ee3291 refactor(i18n): use strings for content 2014-05-06 20:04:09 +02:00
Matteo Pagliazzi
626352e04b improve(i18n): use strings for gear items and potion 2014-05-06 20:04:09 +02:00
Tyler Renelle
8c23bd0d21 chore(april-fools): revert april fools 2014-04-02 00:05:33 -06:00
Tyler Renelle
71a23096cc feat(april-fools): april fools (revert here when done) 2014-03-31 20:12:16 -06:00
Sabe Jones
450a4e4ff5 feat(market): Implement Deer egg purchase 
Adds the Ghost Stag quest to the list of pet quests that unlock egg purchases in Market after 2 completions.
 2014-03-21 22:53:19 -05:00
Tyler Renelle
239e8abf68 feat(equipment): remove base gear from equipment. index.coffee is now 
such that when you click the same gear you have equipped, it un-equips.
 2014-03-21 15:03:46 -06:00
sabrecat
7102943aa1 feat(quests): Allow purchase of quest pets 
Implements purchase in the Market of the two currently available pet quest eggs, after the user has completed the corresponding quest at least twice. This is a hard-code solution; @lefnire or others a little more adept in Angular might be able to make this generic and extensible with an ng-repeat--I just couldn't get the expression quite right.
 2014-03-17 12:20:27 +00:00
Sabe Jones
d62d94c4fc WIP: Enable quest eggs in Market after two runs 2014-03-16 22:23:23 -05:00
Sabe Jones
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
Tyler Renelle
13094c127a feat(premium): unlock mystery items within timeframe of sub sign-on 2014-02-22 21:43:44 -08:00
Tyler Renelle
91d8ebad6d feat(premium): add mystery-item gear slot 2014-02-22 20:38:16 -08:00
Tyler Renelle
a8e890a6df feat(premium): mystery items 2014-02-21 17:37:37 -08:00
Marc-André Larivière
dc75834ec4 Changed hints style (and small quick fixes) 2014-02-16 10:13:16 -05:00
Tyler Renelle
fd6eb8724e feat(valentine): valentine event 2014-02-13 18:40:33 -07:00
Matteo Pagliazzi
fa2c64d2d8 chore(i18n): prepare english for transifex: remove ending or starting space & _comment strings 2014-02-11 19:30:55 +01:00
Matteo Pagliazzi
5874941b94 refactor(bs3): inventory & misc 2014-02-09 12:32:12 +01:00
Tyler Renelle
3473b73452 chore(Merge): branch 'develop' into bs3 
Conflicts:
	views/options/inventory/inventory.jade
 2014-02-07 17:42:12 -07:00
Tyler Renelle
d034262834 feat(premium): subscriber mystery item (doesn't yet do anything) 2014-02-07 11:40:34 -07:00
Matteo Pagliazzi
5d4d82ad51 refactor(bs3): port options (profile, inventory, social (groups and hall)) and misc 2014-02-05 19:05:42 +01:00
Matteo Pagliazzi
b89081dd41 refactor(bs3): misc fixes 2014-02-04 20:18:27 +01:00
Matteo Pagliazzi
685b7a3cd2 Merge branch 'develop' into paglias/bs3 2014-02-04 20:16:00 +01:00
Tyler Renelle
07a47d353d Merge pull request #2666 from marcgenesis/develop 
Fixed inventory alignment. Issue #2158
 2014-02-04 11:00:52 -08:00
Matteo Pagliazzi
3e077fea6d refactor(bs3): port rebirth and reroll modals, misc fixes 2014-02-02 13:52:42 +01:00
Tyler Renelle
527f230ee5 Merge pull request #2701 from deilann/wizardtomage 
Change "Wizard" to "Mage" in member modal & inventory
 2014-02-01 16:21:32 -08:00
deilann
dafd015173 wizard to mage in inventory 2014-02-01 15:20:02 -08:00
Marc-André Larivière
0afaa69d7d Created new CSS entry for equipment title and modified inventory.jade accordingly 2014-02-01 13:17:21 -05:00
Marc-André Larivière
875698c111 Created new CSS entry for equipment-title and modified inventory.jade accordingly 2014-02-01 12:52:38 -05:00
Tyler Renelle
52f8f0d5b0 feat(winter): remove winter scrolls & snowballs 2014-02-01 07:43:25 -08:00
Tyler Renelle
800231cf64 feat(quests): allow html in quest notes 2014-01-31 15:06:56 -07:00
Tyler Renelle
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
Marc-André Larivière
2e64b03a63 Fixed inventory alignment. Issue #2158 2014-01-30 19:58:34 -05:00
Marc-André Larivière
49ec9d2e5c Fixed inventory alignment. Issue #2158 2014-01-30 19:57:50 -05:00
Marcelo Sizer
44d9ea2a15 i18n(interpolation): Add string interpolation 2014-01-30 18:25:25 -02:00
Cole Gleason
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
Matteo Pagliazzi
9226b83d84 Merge pull request #2591 from Alys/patch-2 
Market "Sell..." button: add spaces, remove bracket
 2014-01-28 10:48:54 -08:00
Tyler Renelle
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
Alice Harris
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 4f07ab39b0

- 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
Tyler Renelle
51bff23885 fix(stable): show hatchable combo when petOwned>0 (fyi @deilann) 2014-01-26 17:46:09 -08:00
Marcelo Sizer
17c63cdc6e Replace string for env.t 2014-01-24 20:26:33 -02:00
Matteo Pagliazzi
d107db7013 refactor(translations) 2014-01-24 21:27:06 +01:00
Marcelo Sizer
d3d970b87f Make locked quests purchasable 2014-01-23 23:11:30 -02:00
Marcelo Sizer
9e6a9a3d0e Don't show information if the quest is locked 2014-01-23 18:26:55 -02:00
Marcelo Sizer
6c68c51ab5 Fix version conflict 2014-01-23 17:26:37 -02:00
Marcelo Sizer
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
Matteo Pagliazzi
13a7cc9d55 improve(translations): merge pr and lots of fixes 2014-01-23 17:02:16 +01:00
Matteo Pagliazzi
a6c67f1781 fix(translations): merge @luveluen pull request, fix some syntax 2014-01-22 16:09:32 +01:00
Luveluen
4f07ab39b0 Update inventory.jade 2014-01-22 12:10:51 +01:00
Tyler Renelle
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
Luveluen
c85e3a2107 Update inventory.jade 2014-01-20 19:23:49 +01:00
Luveluen
18eeafafc8 Update inventory.jade 2014-01-20 19:07:50 +01:00
Luveluen
06132f8a48 Update inventory.jade 2014-01-20 18:55:29 +01:00
Matteo Pagliazzi
d000c70679 fix(translations): revert some views 2014-01-20 17:08:27 +01:00
Luveluen
462f11e48c Update inventory.jade 2014-01-20 16:08:37 +01:00
Cole Gleason
58803773d2 Allow users to purchase quest scrolls even if they haven't finished the previous quest 2014-01-10 15:43:44 -06:00
Tyler Renelle
928f7cfdd7 Merge remote-tracking branch 'origin/sabe/rebirth' into develop 
Conflicts:
	src/models/user.js
	views/shared/modals/index.jade
 2013-12-31 08:04:51 -07:00
Tyler Renelle
0eedeea47d fix #2107, add note about creating empty parties for quests 2013-12-25 12:09:34 -07:00
Tyler Renelle
f8559b1762 bosses: pretty things up amongst the modals, etc. Move rewards to a 
directive so we can share it. Add dialog on quest-completion using
user.party.quest.completed flag
 2013-12-24 23:30:48 -07:00
Tyler Renelle
094989db13 quests: add collection quests, incl. polar bear pt 2, and quest arks, and achievements 2013-12-24 17:24:09 -07:00
Sabe Jones
cc3632b611 Add Orb of Rebirth to shop, image to modals, tweak modal text 2013-12-24 09:57:04 -06:00
Tyler Renelle
8095397317 Quests: hurt boss via score method, refactor chat function, change all content.*.name to content.*.key for consistency 2013-12-23 01:19:18 -07:00
Tyler Renelle
ecb354e2cc Quests: initial Bosses WIP - invite, accept, reject, etc 2013-12-22 17:46:54 -07:00
Tyler Renelle
61245e31b8 update justin guide re: todos adding 1MP 2013-12-21 18:50:18 -07:00
Tyler Renelle
226b90b74d add headers for equipment / costume panes (@sabrecat) 2013-12-21 15:29:55 -07:00
Tyler Renelle
676112c1b5 winter event! npcs, snowball=>snowman, new hairs/beards. Fixes to beard/chin overlays. move Fortify Service => "Fortify Potion" Special. @sabrecat let me know what you think: http://gyazo.com/55cd424f104b8f3acb557b99d918cb4b). Sorry for mixing concerns in this commit, some rebase difficulties 2013-12-20 10:26:23 -07:00
Sabe Jones
c43d784834 Add mention of Health refill to Fortify 2013-12-17 22:14:15 -06:00
Tyler Renelle
2efc0972d6 cleanup some inventory tabs. now it's inventory > drops, pet, mounts, equipment 2013-12-17 16:51:27 -07:00
Tyler Renelle
949cd97b91 fix(#2003) healer gear not showing 2013-12-16 22:50:44 -07:00