Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,058 Commits 64 Branches 1,256 Tags
bef4f0685e995ef0fe23d9cc3d4bb71e9bb44dfa
Commit Graph

288 Commits

Author SHA1 Message Date
Tyler Renelle bef4f0685e Merge pull request #2291 from HabitRPG/sabe/tweak2 
Beef up critical hit notification with its own style and icon
 2014-01-07 10:34:07 -08:00
Sabe Jones 1a92ec1748 Beef up critical hit notification with its own style and icon 2014-01-07 12:03:07 -06:00
Sabe Jones be2def91f1 Fix #2048 (streak bonuses not appearing to add up) 2014-01-07 11:14:34 -06:00
Cole Gleason eb9db5b612 Don't show Streak achievement modal on Fix Character Values if it was previously undefined 2014-01-06 16:43:56 -06:00
Tyler Renelle f6e6d115ac chat: add +1 (like) to messages. @snicker does views/options/social/chat-message.jade flag you for any performance issues which should be optimized with bindonce? (I'm still a bit of a bo-noob) 2014-01-05 22:12:02 -07:00
Tyler Renelle eb5a9150ab hall: use infinite-scroll to load patrons, since there are so many 2014-01-05 19:51:33 -07:00
Tyler Renelle a5db8628e2 hall: start moving admin stuff to hall-of-heroes / hall-of-patrons, so everyone can see contribs / backers 2014-01-05 19:19:34 -07:00
Tyler Renelle e474278ab3 groups: upon group-creation, creator is automatically assigned as leader 
and only member. Remove sending up leader & members from the client,
should all be handled on the server
 2014-01-05 15:08:10 -07:00
Sabe Jones 7904b8e4db Clear up some confusion caused by AngularJS number filter 2014-01-05 09:32:20 -06:00
Tyler Renelle 3a5eda1e98 Merge remote-tracking branch 'origin/sabe/attributes' into develop 
Conflicts:
	views/shared/footer.jade
 2014-01-04 16:02:22 -07:00
Dušan Juretić f854d2d022 Use $window on inventoryCtrl, so it can be mocked on tests 2014-01-04 00:01:29 -03:00
Tyler Renelle c9e083b602 challenges: add "official habitrpg challenge" option 2014-01-03 13:36:13 -07:00
Cole Gleason f218a52bf2 Add Critical Hit notification by watching user._tmp.crit 2014-01-02 13:41:50 -06:00
Sabe Jones a9e57a8adf Merge branch 'develop' into sabe/attributes 2014-01-01 12:42:53 -06:00
Tyler Renelle 09eddd3eb2 checklists #2198 click badge to collapse checklist @sabrecat 2013-12-31 14:03:16 -07:00
Sabe Jones be38029015 Extend notification time, fix MP alerts 2013-12-31 10:29:48 -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
Sabe Jones 9c5f1c2150 Add debug button to hand out levels one at a time 2013-12-30 22:56:01 -06:00
Tyler Renelle c7dde3cde1 checklists: add CL up/down keyboard nav 2013-12-30 13:42:19 -07:00
Tyler Renelle 1110338b9b checklists: handle backspacing an empty CL item 2013-12-30 13:19:42 -07:00
Tyler Renelle ebc7cf6bcb checklists: better handling of saveTask, keypress:13, and remove-blur 2013-12-30 12:56:26 -07:00
Tyler Renelle 1ace999cb7 Tasks: add double-click to edit, and date-picker-popup for 
due-dates. Show red dates when overdue (basic)
 2013-12-30 10:33:48 -07:00
Tyler Renelle 74c905f1e1 checklists WIP 2013-12-30 10:33:17 -07:00
Tyler Renelle 34a955665c Merge pull request #1986 from Magnilucent/develop 
Fixes #1959: petCount was only being updated...
 2013-12-28 21:15:32 -08:00
Tyler Renelle 13e1792685 Merge pull request #2123 from HabitRPG/sabe/tweak3 
Fix #2072 (add Mana delta alerts)
 2013-12-27 07:53:12 -08:00
Sabe Jones 3074cc8f16 Fix #2072 (add Mana delta alerts) 2013-12-26 07:31:00 -06:00
Sabe Jones e5b8a92ea2 Minimal fix for #2092 2013-12-25 23:56:51 -06:00
Sabe Jones f38b8e41af Final commit for Rebirth feature! Implement achievement and prestige icon 2013-12-25 17:56:55 -06:00
Tyler Renelle 83817ec2ee bosses: add extra notes about losing quest scroll on abort 2013-12-25 11:20:38 -07:00
Tyler Renelle 44e89d1be7 bosses: misc small bugs 2013-12-25 00:55:38 -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
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 8b8f385fff winter: make bailey head more visible with holiday gear (remember to 
revert this after 1/31!)
 2013-12-20 23:14:08 -07:00
Tyler Renelle bf699ca466 Merge branch 'winter' into develop 2013-12-20 21:59:54 -07:00
Tyler Renelle 58195d9eeb #2012 preventDefault as well as stopPropagation. This will preven the 
checkbox from getting checked, which may not be desirable, but at least
 prevents the bug for now
 2013-12-20 19:57:03 -07:00
Tyler Renelle a4ba5b036f save user on spell-cast (so we don't get second mp loss notif) 2013-12-20 18:52:14 -07:00
Tyler Renelle f4fca98bd1 fix #2058 double-task deletion 2013-12-19 21:45:52 -07:00
Tyler Renelle 06ee34c09b fix #2040 - $rootScope.moment = window.moment. Fixes to applying spell 2013-12-17 23:08:41 -07:00
Tyler Renelle 04df61fb53 fix #2030, immediately "fulfill" spell cast, don't wait for server response 2013-12-17 19:33:36 -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 ceea1b5909 #2008 add option to disable sticky header 2013-12-17 14:04:38 -07:00
Tyler Renelle d2a460769d #2008 #2020 use jquery.sticky instead of bootstrap affix 2013-12-17 13:41:13 -07:00
Tyler Renelle 2b7730b6e3 fix #2007 resotore MPfix restore mp 2013-12-17 09:17:41 -07:00
Tyler Renelle 949cd97b91 fix(#2003) healer gear not showing 2013-12-16 22:50:44 -07:00
Tyler Renelle 4650e2f592 classes: timeout on justin. would prefer of $state.go() had a callback param 2013-12-16 21:16:32 -07:00
Tyler Renelle 91f5da7989 [#1994] dismiss alert fix 2013-12-16 15:43:16 -07:00