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
5690 commits 3 branches 0 tags 1.6 GiB
Commit graph

124 commits

Author SHA1 Message Date
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
Tyler Renelle
5251b4ce3c classes: add just guide for classes unlock 2013-12-16 13:33:05 -07:00
Tyler Renelle
91e1287d06 APIv2: some finalization of APIv2. Add new routes, re-rigg 
query/param/body requirements. This overhauls the API pretty
substantially, so we'll indeed be moving this to apiv2, using v1 for the
old API, and limiting it's use substantially
 2013-12-15 16:53:06 -07:00
Tyler Renelle
12cc6f51eb classes: reposition inventory, fix saddle confirm dialog, gems & food tweaks 2013-12-15 13:25:19 -07:00
Tyler Renelle
dc348d5601 [#1969] add in @Fandekasp's shirts, had to do separate commit for handling of 
user.preferences.shirt
 2013-12-14 00:35:03 -07:00
Tyler Renelle
b5a4177719 separate saddle out to it's own market section 2013-12-12 18:38:05 -07:00
Tyler Renelle
ee1cd3c05d [#1977] APIv2 WIP - start of a framework where operations are shared 
between client & server. If the op is called on the client, it updates
the user & then POSTs to the server with op of the same name. If called
on server, it updates the user and user.save()s
 2013-12-11 21:42:57 -07:00
Tyler Renelle
76565384d3 Merge branch 'classes' into develop 
Conflicts:
	public/js/controllers/tasksCtrl.js
	views/shared/modals/settings.jade
 2013-12-08 18:17:53 -07:00
Tyler Renelle
c524972aa2 Merge pull request #1952 from HabitRPG/sabe/tweak 
Tweaks from Sabe
 2013-12-08 08:50:37 -08:00
Tyler Renelle
4d3a359d6b fixes to sabe/tweak #1952 @SabreCat (put gems inline with fortify 
button, remove reroll from store)
 2013-12-08 09:46:30 -07:00
Tyler Renelle
f8f8a1334b Merge branch 'develop' into classes 
Conflicts:
	views/options/inventory/stable.jade
 2013-12-07 20:23:26 -07:00
Tyler Renelle
79e8b2f4a5 Revert "mounts: temporarily remove mounts code from views. merging to master so" 
This reverts commit d245c87f29.
 2013-12-07 11:34:53 -07:00
Tyler Renelle
3e5c213694 classes armory: separate gear listings by class type, show selected gear 2013-12-06 09:26:02 -07:00
Tyler Renelle
2563ec5763 classes: beards & mustaches! 2013-12-05 03:31:02 -07:00
Tyler Renelle
5fea978e6b costumes: add costume support in inventory 2013-12-04 22:50:20 -07:00
Tyler Renelle
88c64a6f80 classes & grunt-spritesmith: NPCs habitrpg-shared#85164c9 2013-12-04 16:52:06 -07:00
Tyler Renelle
19b6eb73e0 Merge branch 'develop' into classes 
Conflicts:
	public/css/index.styl
	src/models/user.js
	views/options/profile.jade
	views/shared/header/avatar.jade
	views/shared/tasks/lists.jade
	views/shared/tasks/task.jade
 2013-12-02 18:24:33 -07:00
Sabe Jones
af80548a34 Partial fix to #1938 (New name and location for Re-Roll) 2013-12-01 11:58:03 -06:00
Tyler Renelle
91c141140d classes: armory WIP 2013-11-30 16:33:21 -07:00
Sabe Jones
c51a34730d Tweak shop wording to remove "yet": eggs/potions/food might be used up or sold off. 2013-11-24 08:53:48 -06:00
Sabe Jones
6cc41c47c7 Work on standardizing terminology 2013-11-17 09:36:38 -06:00
Tyler Renelle
2b286ba889 [#1821] [#1723] fix pet counters (incl for member modals) 2013-11-15 17:51:00 -08:00
Tyler Renelle
d245c87f29 mounts: temporarily remove mounts code from views. merging to master so 
we can run schema migration and start with item translations. This commit will be reverted
when mounts is fully merged
 2013-11-14 12:59:00 -08:00
Tyler Renelle
e6f524fce2 mounts: much cleaner inventory interface. Replace text (underneath) with 
gem cost. Use popover instead of tooltip, show item.text & item.notes
for more details than before (especially useful for saddle). Screenshot: http://goo.gl/0AfLfG
 2013-11-10 20:03:54 -08:00
Tyler Renelle
05c3e71a92 mounts: fixes to starter food css 2013-11-10 19:18:06 -08:00
Tyler Renelle
085919c000 mounts: update all html & javascript to support UserSchema overhaul (60421a8). Also add very basic feeding & saddling mounts functionality. use progress bars to indicate pet feeding progress 2013-11-10 11:04:41 -08:00
Shane Lister
64ed414ae6 Update inventory.jade 2013-11-08 10:53:28 -08:00
Shane Lister
30e4dbcb98 Update Hatching Instructions 
On behalf of @bobbyroberts99
 2013-11-08 10:43:22 -08:00
bobbyroberts99
5b09bd30b4 Clarify pet hatching instructions 
This is my first PR. Hope I'm in the right place.
 2013-10-31 09:34:43 -07:00
Tyler Renelle
35c4a62de0 challenges: switch from ngRoute to ui-router 2013-10-28 11:34:08 -07:00