sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-08-04 09:39:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
4099 commits 3 branches 0 tags 1.6 GiB
Commit graph

1506 commits

Author SHA1 Message Date
Tyler Renelle
d966833782 #1499 ng-if to hide/show task editing (fewer watchers) 2013-12-29 00:14:55 -07:00
Tyler Renelle
b20a3b7381 #1499 add list filter on tasks to not display completed todos at all 
until "completed" tab clicked
 2013-12-29 00:14:46 -07:00
Tyler Renelle
57cd53cfc9 fix #2155 . Since quest.leader is new, doesn't apply to quests started 
before today. Show abort/begin for all quest members if quest.leader
doesn't exist, otherwise only show those options to the leader
 2013-12-28 21:54:25 -07:00
Tyler Renelle
ea0b5b9291 quest: add quest leader. only quest-leader can begin/abort. Abort 
restores quest scroll to leader. Bug fixes on clearing quest
data (completion, abort, etc)
 2013-12-28 16:36:16 -07:00
Bob Steffes
5c89954b83 Update Request Feature link 
Link now goes directly to How to Submit a New Request card. Previously it was linking to the Trello board (not the card).
 2013-12-27 19:21:30 -08:00
Tyler Renelle
fa2fddb516 winter: add snowball achievement 2013-12-27 09:48:58 -07:00
Sabe Jones
cc5a6de9cb Initial commit: add allocationMode user preference and form for choosing it 2013-12-27 09:54:48 -06:00
Bob Steffes
ae84ebc47c Change link to Trello feature request card 
Instead of linking to the Board it now links directly to the card
 2013-12-27 08:50:08 -07:00
Tyler Renelle
e9e2f26a9f collection quest item icons fix 2013-12-25 21:26:51 -07:00
Tyler Renelle
fc83ef73ac admin: add section in admin page for manually granting gems and 
disabling ads. @sabrecat @wc8 @lemoness @bobbyroberts99 @redphoenix - no pressure,
just in case you see tavern cries that i don't see.apology-gems and restore-streaks
 2013-12-25 20:33:21 -07:00
Sabe Jones
f38b8e41af Final commit for Rebirth feature! Implement achievement and prestige icon 2013-12-25 17:56:55 -06:00
Tyler Renelle
0eedeea47d fix #2107, add note about creating empty parties for quests 2013-12-25 12:09:34 -07:00
Tyler Renelle
76da27478a bosses: update wording to make cron-calculations more obvious 2013-12-25 11:45:29 -07:00
Tyler Renelle
e9b0ccc057 Evil Santa => Trapper Santa 2013-12-25 08:30:55 -07:00
Tyler Renelle
fc4a141d2e bosses: bailey 2013-12-25 08:24:39 -07:00
Tyler Renelle
44e89d1be7 bosses: misc small bugs 2013-12-25 00:55:38 -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
3b94b18bb6 Implement Rebirth in controllers and API, revise modal per @wc8 feedback 2013-12-24 18:09:32 -06: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
f538a91538 bosses: no models, performance improvements 2013-12-23 14:17:08 -07:00
Tyler Renelle
ae403a55a5 quests: add abort feature 2013-12-23 02:56:55 -07: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
067fbe861c remove math updates notif now that things have settled down a bit (most 
updates now should be subtle). @wc8 @sabrecat let me know if you think
this is premature
 2013-12-22 11:47:10 -07:00
Sabe Jones
60c622f1c1 Initial commit: unlock notification, new modals 2013-12-22 08:32:39 -06:00
Tyler Renelle
4adb66cc4f add notif on iOS for math updates 2013-12-21 18:50:18 -07:00
Tyler Renelle
61245e31b8 update justin guide re: todos adding 1MP 2013-12-21 18:50:18 -07:00
Tyler Renelle
82f24c2b5e Merge pull request #2077 from bobbyroberts99/patch-1 
Add wiki glossary to tavern
 2013-12-21 14:39:43 -08:00
Tyler Renelle
226b90b74d add headers for equipment / costume panes (@sabrecat) 2013-12-21 15:29:55 -07:00
Tyler Renelle
cdf8c2412f fix to mathUpdates on usermodel 2013-12-21 15:15:01 -07:00
Tyler Renelle
8280208fae lvl 10 classes unlock 2013-12-21 15:07:19 -07:00
Tyler Renelle
db5de3ef7b some classes-math wording updates 2013-12-21 15:05:32 -07:00
Bob Steffes
8578c33c07 Add wiki glossary to tavern 
My local repo is behind and ahead so I'm submitting from GitHub. Not sure how to fix, so if there a bunch of old commits, please ignore. This is the only active one I've got going.
 2013-12-21 13:57:02 -08:00
Tyler Renelle
640dd04dd3 add notif re: math updates for classes (@wc8) 2013-12-21 14:55:18 -07:00
Tyler Renelle
f2d58e1c8e update bailey per @lemoness , update limited-edition end date 2013-12-20 18:52:32 -07:00
Tyler Renelle
9518cd1b51 winter: add salt spell to remove snowball buff 2013-12-20 18:35:50 -07:00
Tyler Renelle
6cb90093d0 winter: bailey notif, show winter colors as limited-edition 2013-12-20 11:03:43 -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
Tyler Renelle
f4fca98bd1 fix #2058 double-task deletion 2013-12-19 21:45:52 -07:00
Tyler Renelle
6e3bb61f6e temporarily disable stats in party-member modals 2013-12-19 18:23:55 -07:00
Tyler Renelle
9fc5784320 classes: add streaks buff for mages 2013-12-18 10:39:23 -07:00
Tyler Renelle
75acffa073 show stealth buff in stats 2013-12-18 10:23:22 -07:00
Tyler Renelle
06ee34c09b fix #2040 - $rootScope.moment = window.moment. Fixes to applying spell 2013-12-17 23:08:41 -07:00
Sabe Jones
c43d784834 Add mention of Health refill to Fortify 2013-12-17 22:14:15 -06:00
Tyler Renelle
7195d53442 fix #2033 gems need to be div, not span 2013-12-17 19:39:11 -07:00
Tyler Renelle
41cc6ff3bc fix #2032 - add button to show classes tour, mention 10pt/day mp regen 2013-12-17 19:22:21 -07:00
Tyler Renelle
d03a996946 classes: very simple "buffs applied" icon next to level, add chat message 
for party / member casts (@wc8 @sabrecat)
 2013-12-17 19:16:31 -07:00
Tyler Renelle
03c4a04ff5 classes: better-positioned justin 2013-12-17 17:24:14 -07:00
Tyler Renelle
e0623e6add classes: remove extra note about inventory 2013-12-17 17:18:59 -07: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
87f4a1d204 #2017 add ability to opt out of classes entirely (@wc8) 2013-12-17 16:44:46 -07:00
Tyler Renelle
ceea1b5909 #2008 add option to disable sticky header 2013-12-17 14:04:38 -07:00
Tyler Renelle
3b02717271 #2008 #2020 fixes to justin popovers so they don't go funky with sticky.js 2013-12-17 13:47:44 -07:00
Tyler Renelle
d2a460769d #2008 #2020 use jquery.sticky instead of bootstrap affix 2013-12-17 13:41:13 -07:00
Tyler Renelle
94dc0a0c5b fix #2004 don't show party invitations when it's an empty object 
{} (remember, {} is truthy)
 2013-12-17 12:12:28 -07:00
Tyler Renelle
51c6914b56 tmp 2013-12-17 09:42:00 -07:00
Tyler Renelle
e13da00a54 fix #2009 how about a compromise. change button to "change and 
reroll" (it's right next to your class name, so "change what?" should be
obvious)
 2013-12-17 09:26:15 -07:00
Tyler Renelle
2b7730b6e3 fix #2007 resotore MPfix restore mp 2013-12-17 09:17:41 -07:00
Tyler Renelle
e9ed847a4e classes: updating class-selection description to include note about gear being 
transfered to inventory. It's in the tour, but most people seem to be
missing it... @sabrecat thoughts on this?
 2013-12-16 23:52:39 -07:00
Tyler Renelle
2e098ce87b classes: bailey 2013-12-16 23:33:05 -07:00
Tyler Renelle
949cd97b91 fix(#2003) healer gear not showing 2013-12-16 22:50:44 -07:00
Tyler Renelle
ee3e7c2032 [#1990] Spelling updates 2013-12-16 16:28:46 -07:00
Tyler Renelle
3fe74e7708 cleaner stats page 2013-12-16 14:29:44 -07:00
Tyler Renelle
2175d7733d classes: better stats breakdown, including buffs 2013-12-16 14:18:31 -07:00
Tyler Renelle
3b4fca506a separate unlock for facial-hair / hair 2013-12-16 13:46:54 -07:00
Tyler Renelle
302340bee2 [#1997] classes: add MP to restore dialog (@wc8 you might find this useful) 2013-12-16 13:38:23 -07:00
Tyler Renelle
5251b4ce3c classes: add just guide for classes unlock 2013-12-16 13:33:05 -07:00
Tyler Renelle
a1590f7f3e classes: update some classes wording 2013-12-16 13:03:33 -07:00
Tyler Renelle
8082d8ae30 add unlock set for hairs, beards, mustaches 2013-12-16 12:15:59 -07:00
Tyler Renelle
7c2e803475 classes: charge gems for class-change 2013-12-16 11:47:55 -07:00
Tyler Renelle
5f689960b6 [#1994] fixes to MP bar 2013-12-16 11:08:39 -07:00
Tyler Renelle
259f9033c4 APIv2: add paths /api/v2/* and /api/v1/*. v1 has limited deprecated routes (only the things I know currently work), and we'll notify 3rd-partyists to migrate to apiv2 once it's documented and tested 2013-12-15 17:54:34 -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
d0b07ba4db apiv2: move tags to apiv2 (remove from client/server, move to Shared.ops) 2013-12-15 14:16:04 -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
774775de7a fixes: appliedTags, add moment to rootScope (repeat i18n issues). Also, 
discard the sync-queue if errors were detected. Previously, if an op
triggered server error, the op is still in the queue and will keep
trying. Thus, in-browser user is corrupt - they'll need to logout /
clear localStorage. This *should* fix that, while still allowing the
sync-queue to build up when offline (status appears to == 0 in those
cases). @paglias just FYI - should be good, but wanna loop you in just
in case.
 2013-12-15 12:11:25 -07:00
Tyler Renelle
bc0034f022 apiv2 handle notifications circular-dependency. migration 
fixes. Rest=>Sleep fixes
 2013-12-15 10:57:53 -07:00
Tyler Renelle
ae4ca337c8 Merge pull request #1949 from bobbyroberts99/develop 
Reposition Markdown formatting link
 2013-12-14 21:21:45 -08:00
Tyler Renelle
0f5afbedfb Merge pull request #1988 from HabitRPG/sabe/tweak 
Add explicit cancel button to Fortify modal
 2013-12-14 21:09:25 -08:00
Sabe Jones
68b2c8b6bc Add explicit cancel button to Fortify modal 2013-12-14 19:23:40 -06:00
Tyler Renelle
d1a34f570d customizations: migrate skins for more PCs, start building out migration 2013-12-14 16:12:41 -07:00
Bob Steffes
182a34ed7e Update footer FAQ to wiki 2013-12-14 10:59:45 -08: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
549add08ed classes: 2gems / new hair,beard,stache 2013-12-13 22:56:00 -07:00
Tyler Renelle
6ae14cc42f classes: misc fixes 2013-12-13 21:53:42 -07:00
Tyler Renelle
c85450db04 classes: add task attributes for point allocations 2013-12-13 17:50:43 -07:00
Tyler Renelle
d2121a8587 fix(classes) misc fixes 2013-12-13 17:08:25 -07:00
Tyler Renelle
9d9b8120cd classes: migrate priority from !,!!,!!! to Number (prep for passive stats) 2013-12-12 20:59:20 -07:00
Tyler Renelle
478be61113 fix(classes) misc class fixes (not @snicker, ng-if on item store since 
we dynamically swap it sometimes)
 2013-12-12 20:03:32 -07:00
Tyler Renelle
b5a4177719 separate saddle out to it's own market section 2013-12-12 18:38:05 -07:00
Tyler Renelle
dc63eff41d [#1977] move sleep & clear-completed to user.ops 2013-12-12 16:59:53 -07:00
Thibaut Girka
6604a36a9a Fix syntax error in jade file 2013-12-12 18:56:43 +01: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
Sabe Jones
847f090b7a Remove "yet" from no-food message 
Fix pet peeve :trombone:
 2013-12-08 21:25:34 -06:00
Tyler Renelle
b6fceaca1b fix some tavern links 2013-12-08 19:55:49 -07:00
Tyler Renelle
108d852d12 remove reroll from tasks/lists.jade 2013-12-08 19:04:18 -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
714dad6e91 classes: small bug fixes 2013-12-07 20:41:48 -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
680f0e974e mounts: bailey notif 2013-12-07 11:56:34 -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
59f8727cbf classes: small tweaks 2013-12-07 11:31:11 -07:00
Tyler Renelle
c51cdd0849 classes: proper handling of items on class-switch, un-equipping items, 
etc. Paves way for item-loss on death. See habitrpg-shared#acae9c3
 2013-12-06 15:41:58 -07:00
Tyler Renelle
8216828514 classes #943 reroll sets you on your new class's item track. Handling of two-handed staves 2013-12-06 10:51:23 -07:00
Tyler Renelle
3e5c213694 classes armory: separate gear listings by class type, show selected gear 2013-12-06 09:26:02 -07:00
Sabe Jones
dd8b38ca04 Answer tavern FAQ in resource links 2013-12-06 06:34:54 -06:00
Tyler Renelle
b9845aec4a classes: fixes to buying special-gear & regular gear habitrpg-shared#ee4777d 2013-12-05 15:48:50 -07:00
Tyler Renelle
e5c34af7fd grunt-spritesmith contrib gear habitrpg-shared#69d248f 2013-12-05 15:47:08 -07:00
Tyler Renelle
ad0c953d0a classes: misc spell-casting fixes, support party spells 2013-12-05 11:05:47 -07:00
Tyler Renelle
5fd378ebed classes: fixes to beard / chin overlap 2013-12-05 11:05:36 -07:00
Tyler Renelle
80e97a71ed classes: misc fixes 2013-12-05 09:52:41 -07:00
Tyler Renelle
2563ec5763 classes: beards & mustaches! 2013-12-05 03:31:02 -07:00
Tyler Renelle
dde0655900 classes: fixes to class-selection & reroll, remove show/hide gear since 
we're using costumes
 2013-12-04 23:53:55 -07:00
Tyler Renelle
5fea978e6b costumes: add costume support in inventory 2013-12-04 22:50:20 -07:00
Tyler Renelle
decaa2867b classes: misc fixes. start a running migration file (add to, or add notes as we go along) 2013-12-04 17:50:40 -07:00
Tyler Renelle
88c64a6f80 classes & grunt-spritesmith: NPCs habitrpg-shared#85164c9 2013-12-04 16:52:06 -07:00
Tyler Renelle
8803df46c0 classes & grunt-spritesmith: death, paws, gems-cleanup 2013-12-04 16:02:08 -07:00
Tyler Renelle
55d0a0a94d classes: fix customizations based on habitrpg-shared#9821a88 2013-12-04 15:09:56 -07:00
Tyler Renelle
350e3681d7 classes: grunt-spritesmith fixes 2013-12-03 18:51:19 -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
dab22ec051 Small formatting fix to Advanced Options 2013-12-02 11:10:58 -06:00
Sabe Jones
37f7a923ea Fix #1934 (make Reset and Restore options more distinct) 2013-12-02 10:20:38 -06:00
Sabe Jones
45b87288f0 Change "reroll" to "Fortify" in Gems popover text 2013-12-01 15:03:03 -06:00
Sabe Jones
af80548a34 Partial fix to #1938 (New name and location for Re-Roll) 2013-12-01 11:58:03 -06:00
Bob Steffes
2905a2777e Fix reposition of markdown formatting after 2 reverts 
What a mess, but I think it's oK now. Sorry.
 2013-11-30 16:37:04 -08:00
Bob Steffes
0dd911f2ba Revert "Re-modify position of markdown down formatting link" 
This reverts commit 7fdda14cb8.

Conflicts:
	views/options/social/tavern.jade
 2013-11-30 16:29:17 -08:00
Bob Steffes
b1e5ee6433 Revert "Reposition Markdown formatting link" 
This reverts commit 7fdda14cb8.

Conflicts:
	views/options/social/tavern.jade
 2013-11-30 16:26:35 -08:00
Tyler Renelle
91c141140d classes: armory WIP 2013-11-30 16:33:21 -07:00
Bob Steffes
bb3f0ae7ec Reposition markdown formatting link (3rd try) 
This replaces previous 2 commits. z-index has been removed.
 2013-11-30 12:07:23 -08:00
Bob Steffes
db7e582c95 Re-modify position of markdown down formatting link 
I think this one makes more sense than previous PR and it also adjust
spacing of Note. Still interested in feedback (would it make sense to
add to docs.css and call a class or just do it inline?

This is also first time, I've submitted a change to a pull request (and
I'm not sure what's gonna happen). Hopefully github is smart and just
modifies the previous commit (but we'll see).
 2013-11-30 10:21:32 -08:00
Bob Steffes
7fdda14cb8 Reposition Markdown formatting link 
There's probably a better way to do this. Feedback welcome.
 2013-11-30 08:07:20 -08:00
Nick Gordon
62aeb7087a fixes #1936. petCount was only being calculated for the current user, not for the profile being displayed. This data should probably be calculated in the model rather than in a controller 2013-11-27 21:22:15 -08:00
Tyler Renelle
7c20988c41 Merge branch 'thanksgiving' into develop 2013-11-27 11:53:18 -07:00
Tyler Renelle
db5befb570 thanksgiving turkey & npcs 2013-11-27 11:50:18 -07:00
Tyler Renelle
962b854f87 Merge remote-tracking branch 'origin/sabe_tweak' into develop 
Conflicts:
	views/options/social/tavern.jade
 2013-11-27 11:28:31 -07:00
Tyler Renelle
aca122d6de fix up CONTRIBUTING.md, update "submit bugs" links with this change 2013-11-26 17:09:13 -07:00
Nick Gordon
86f62ac2b2 fix for #1920, again. this is very 'un-angular' but it *actually* works. the proper way to do this is make a directive for 'userlevel' or something and have that apply the proper styles 2013-11-26 14:56:24 -08:00
Nick Gordon
a4fb0b42ad well, this wasn't the fix i was thinking of for #1893, but it works and I don't know why I didn't do it in the first place 2013-11-26 12:06:48 -08:00
Nick Gordon
15f3907f00 fix for #1920 2013-11-26 11:51:21 -08:00
Matteo Pagliazzi
d1240473dd use bindonce for days of the week, thanks @snicker! 2013-11-25 17:38:07 +01:00
Matteo Pagliazzi
a47a32dbd6 translate days of the week, @snicker here I would like to use bo-text but does not work 2013-11-25 17:30:35 +01:00
Nick Gordon
c0a02eeef8 support for xml and json export of all user data 2013-11-25 08:06:27 -08:00
Sabe Jones
780b0a3593 Change Markdown help link to point at HabitRPG wiki 2013-11-24 13:13:21 -06:00
Nick Gordon
f4323ddc24 markdown links in chat will now open in a blank window. 
* added `target` attribute for the markdown directive to specify. default behavior is `_self`.
 2013-11-24 10:32:51 -08:00
Matteo Pagliazzi
6736da36d4 use jade class syntax 2013-11-24 17:49:25 +01:00
Sabe Jones
f7908ddbcb Correct and clarify some details on contributor rewards 2013-11-24 09:50:21 -06: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