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

2604 commits

Author SHA1 Message Date
Blade Barringer
6a63f55a94 Added logic so muted version of mount master only appears if user has 
achieved beast master
 2015-01-16 11:37:20 -06:00
Blade Barringer
ff4c2ade96 Added triadBingo to achievement list 2015-01-16 11:32:41 -06:00
Blade Barringer
10bc7e4eac Merge branch 'develop' of github.com:HabitRPG/habitrpg into mountmaster 2015-01-16 10:44:52 -06:00
Sabe Jones
0b63e48c6e feat(quest): T-Rex pet 
Includes news announcements for 1/15/2014, Market implementation for T-Rex dual quest, and the ability for "healing" type Rage meters to work in party-scale boss fights.
 2015-01-15 15:38:51 -06:00
etaiklein
1c771fa4db fixed bug where +habits would behave strangely when targeted by spells 2015-01-14 02:06:41 -05:00
Sabe Jones
17ab1d660f chore(news): Stress Strike 1 Bailey 2015-01-13 13:29:10 -06:00
Blade Barringer
385fe36a0a Merge branch 'develop' of github.com:HabitRPG/habitrpg into mountmaster 2015-01-12 21:50:14 -06:00
Blade Barringer
1557907a1c Updated string names 2015-01-12 13:12:40 -06:00
Blade Barringer
11f20555c4 Corrected stats page to show profile data instead of user data 2015-01-11 17:23:30 -06:00
Alice Harris
7b9514dc5d fix final bit of conflict 2015-01-11 14:54:41 +10:00
Alice Harris
7660141365 Merge remote-tracking branch 'upstream/develop' into todos-dated-tab-2014-11-01 
Conflicts:
	views/shared/tasks/lists.jade
	views/shared/tasks/task.jade
 2015-01-11 14:15:55 +10:00
K. Belardinelli
22446a5ddb apply active class to special spells too 2015-01-10 11:06:39 -05:00
Blade Barringer
09c3b643bd Removed comment because bug was fixed 2015-01-10 09:54:49 -06:00
Blade Barringer
1c0520c94d Removed link to picture of all pets, since it is now inaccurate and 
there is no corresponding one for mounts
 2015-01-10 09:38:03 -06:00
K Bell
d6dc2119cb add active class to spell item when it is selected 2015-01-10 10:36:00 -05:00
Blade Barringer
2b20c52a8d Merge branch 'develop' of github.com:HabitRPG/habitrpg into mountmaster 2015-01-10 09:25:18 -06:00
Blade Barringer
7f20ca7d8b Made title dynamic 2015-01-10 08:26:11 -06:00
Blade Barringer
38f7c1e634 Closes #4490. Day start saves on blur instead of change 2015-01-09 19:10:10 -06:00
Blade Barringer
dc37442691 Merge pull request #4478 from crookedneighbor/cmd-enter-for-chat 
Cmd/Ctrl + enter for chat and pms.
 2015-01-09 13:51:21 -06:00
Blade Barringer
64bb55e57b Reworked mixin file to retain gembutton history 2015-01-09 13:48:19 -06:00
Blade Barringer
a61c4c1b18 Wrote in ng-if to hide the mp if user has not chosen a class 2015-01-09 10:09:07 -06:00
Blade Barringer
9b0d854855 Changed calculation to use profile instead of logged in user (duh) 2015-01-09 09:56:53 -06:00
Blade Barringer
2d0d2cedd9 Converted floor mechanism to filter to match health calculation 2015-01-09 09:50:13 -06:00
Blade Barringer
34bd7cb879 Added mana to stats page 2015-01-09 09:47:06 -06:00
Sabe Jones
cda16d5bc0 Merge pull request #4494 from SabreCat/stressbeast 
World boss for Winter Wonderland 2015
 2015-01-08 15:51:04 -06:00
Sabe Jones
41d073d181 fix(world-boss): Achievement badge 2015-01-08 15:47:48 -06:00
Sabe Jones
ee339fba4a feat(event): World boss 
Implements the second HabitRPG world boss, the Abominable Stressbeast of Stoïkalm!
 2015-01-08 15:22:42 -06:00
Tyler Renelle
cba232ef83 feat(presskit): add presskit page cc @lemoness 2015-01-08 13:41:23 -07:00
Blade Barringer
0807e7856c Merge remote-tracking branch 'upstream/develop' into mountmaster 2015-01-08 11:31:45 -06:00
Matteo Pagliazzi
193b92c16b fix(cds): max hour is 23 not 24 2015-01-06 23:12:03 +01:00
Blade Barringer
8ba0bb5d88 Changed spellObj to skill to be more semantic, and match the text in the 
rewards column
 2015-01-06 15:31:07 -06:00
Blade Barringer
870d9d7e86 Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop 2015-01-06 15:04:47 -06:00
Blade Barringer
9da000ec4e Changed spell to spellObj in ng-repeat for class spells in order to 
assist with applying an active class to current spell. (would collide
with $scope.spell in rootCtrl.js)
 2015-01-06 15:03:54 -06:00
Blade Barringer
96b48324f8 Merge pull request #4484 from crookedneighbor/fix-for-date-on-tasks 
Fix for truncated dates on task due date. Closes #4482
 2015-01-06 14:29:16 -06:00
Blade Barringer
53c466ee7f Rounds tooltip for exp, health and mana to 2 decimal places 2015-01-06 13:52:22 -06:00
Blade Barringer
e416b03a59 Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop 2015-01-06 09:39:04 -06:00
Blade Barringer
dd4e8d74c7 Fix for truncated dates on task due date. Closes #4482 2015-01-06 09:37:29 -06:00
Sabe Jones
8feffa5431 fix(news): Improve accuracy 2015-01-05 17:31:19 -06:00
Blade Barringer
f0c65be629 Fix to allow for challenges with the same award name. Closes #4479 2015-01-05 17:15:33 -06:00
Sabe Jones
8529c0f1db chore(news): Bailey 2015-01-05 16:48:58 -06:00
negue
aa6b1e3f81 add remove-watch to markdown-directive 2015-01-05 22:19:05 +01:00
negue
ad8add58d7 Merge pull request #4461 from negue/markdownText 
change markdown ngModel to text attribute
 2015-01-05 22:12:06 +01:00
Blade Barringer
cc7b2f70ba Hide buy gems button if over level 100 in rebirth modal 2015-01-05 13:41:58 -06:00
Blade Barringer
10451d3296 Removed gem cost if lv 100 or higher 2015-01-05 13:38:00 -06:00
Blade Barringer
f3676fcbf4 Added spaces between quantity and gem symbol 2015-01-05 13:33:43 -06:00
Blade Barringer
a72faa5d92 Added ctrl+cmd enter command to pms 2015-01-05 13:21:23 -06:00
Blade Barringer
5deb72c457 Added ability to send chat via cmd/ctrl + enter 2015-01-05 13:17:23 -06:00
Jackson Popkin
b409e589f1 Add tooltip with exact health/exp/mana 2015-01-04 17:26:11 -05:00
Sabe Jones
09f827e9fe fix(news): Improved plot 2015-01-03 13:18:47 -06:00
Blade Barringer
45c045e853 Corrected which string was being used in achievements 2015-01-02 14:16:40 -06:00
Blade Barringer
68e613c3fc Simplified count checks in keys to the kennel modal. Adjusted balance for releaseBoth to be correct 2015-01-02 14:11:59 -06:00
Blade Barringer
3c3bbcafb9 Simplified count in stable 2015-01-02 14:11:04 -06:00
Blade Barringer
87d78618d8 Changed keys of the kennel npc to Matt 2015-01-02 13:46:21 -06:00
Blade Barringer
406edcb761 Added releaseBoth script and refactored keys to the kennel modal 2015-01-02 13:33:41 -06:00
Blade Barringer
1049e5e152 Key shows up when you have either 90 pets or 90 mounts. Opens lg modal 2015-01-02 13:08:45 -06:00
Blade Barringer
7f2648eafb Renamed release scripts 2015-01-02 12:43:40 -06:00
Blade Barringer
914c780053 Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop 2015-01-01 23:23:08 -06:00
Sabe Jones
3a0de8f9c4 chore(January): news and deactivate cards 2015-01-01 23:20:59 -06:00
Blade Barringer
fc4e43bef8 Merge branch '4401_multiple_buy_gems_popups_with_mixins' of https://github.com/lucymhdavies/habitrpg into gems-mixin 
Conflicts:
	views/shared/gems.jade
	views/shared/modals/buy-gems.jade
 2015-01-01 23:18:28 -06:00
Blade Barringer
c561562009 Merge branch 'lucymhdavies-4401_multiple_buy_gems_popups' into develop 
closes #4401
 2015-01-01 23:12:10 -06:00
Blade Barringer
e2403c52ad Converted more ng-shows to ng-ifs 2015-01-01 21:24:21 -06:00
Blade Barringer
f2d62784f4 Converted ng-show to ng-if 2015-01-01 21:23:39 -06:00
Blade Barringer
e219c0d110 Corrected mountmasterProgress variable name 2015-01-01 21:23:05 -06:00
Blade Barringer
08d13660fb Hid mounts area in stats until dropx enabled 2015-01-01 21:21:53 -06:00
Blade Barringer
04a12542e5 Corrected the achievemnts page to show the right medal for mountmaster 2015-01-01 21:17:58 -06:00
Lucy Davies
0cfb705762 Add behaviour specific to the buy-gems popup. 2015-01-02 00:01:44 +00:00
Lucy Davies
0754b58cc2 Source the new mixin file, and call the mixins in place of including the former gems.jade 2015-01-01 23:58:28 +00:00
Lucy Davies
153e0db71d And of course convert this into a mixin 2015-01-01 23:57:08 +00:00
Lucy Davies
6f3ee14842 Move views/shared/gems.jade -> views/shared/mixins.jade 2015-01-01 23:50:38 +00:00
Blade Barringer
488a53f1cf Corrected comment title 2015-01-01 17:16:23 -06:00
Blade Barringer
a45797a1ba Adjusted text in view to show mountMaster progress 2015-01-01 17:06:34 -06:00
Negue
b3ccdc2859 change markdown ngModel to text attribute 2015-01-01 20:57:57 +01:00
Blade Barringer
7172df7dbb Corrected second half of mountmaster text to only show if mountmaster 
has been achieved at least once
 2014-12-31 16:46:13 -06:00
Blade Barringer
0fd3f290b8 Merge branch 'develop' into mountmaster 2014-12-31 13:14:11 -06:00
Blade Barringer
5d958b1456 Adjusted styles for snowball and spookDust so they would align like the coins 2014-12-31 09:31:56 -06:00
Sabe Jones
ccfe48099f fix(NYE): fix cards 
Improve random messages and have Bailey give instruction on where to find cards.
 2014-12-30 23:25:34 -06:00
Sabe Jones
438516b26f fix(NYE): Correct achievement badge 2014-12-30 22:56:40 -06:00
Sabe Jones
d1355faa31 Merge pull request #4452 from SabreCat/nye 
New Year's event features
 2014-12-30 22:18:11 -06:00
Sabe Jones
230482c578 chore(news): Bailey 2014-12-30 21:58:15 -06:00
Tyler Renelle
edf66cbb59 feat(discount) google discount & use sub.key instead of sub.months 2014-12-30 20:05:07 -07:00
Sabe Jones
e35722865a fix(NYE): I18N for random text 2014-12-30 20:52:06 -06:00
Sabe Jones
51acc477fe feat(NYE): New Year's cards 2014-12-30 19:57:24 -06:00
Blade Barringer
b4975bb8a4 Merge branch 'groupSorting' of https://github.com/vIiRuS/habitrpg into vIiRuS-groupSorting 
Conflicts:
	public/js/controllers/headerCtrl.js
	views/options/social/group.jade
 2014-12-30 12:57:32 -06:00
Blade Barringer
303d30a270 Merge pull request #4439 from crookedneighbor/transparent-gems 
Added transparent class to gem purchasing if zero gems are available for purchase
 2014-12-30 11:11:32 -06:00
Sabe Jones
d8cfc1dd4b WIP(NYE): New Year's cards 2014-12-29 20:58:28 -06:00
Sabe Jones
53fff0dbc6 feat(seasonal): Implement Snowball 
Adds the snowball from Winter 2014 to the Seasonal Shop.
 2014-12-29 19:40:11 -06:00
Blade Barringer
4eca27f19e Corrected class name closes #4434 2014-12-29 19:15:51 -06:00
Blade Barringer
0ddbbc93a3 Merge branch 'develop' of https://github.com/melissamcewen/habitrpg into melissamcewen-develop 2014-12-29 18:33:14 -06:00
Blade Barringer
efba545147 Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop 2014-12-29 15:44:06 -06:00
Blade Barringer
b3025c36b1 Fixed checklist not advancing to next input. Closes #4430 2014-12-29 15:43:20 -06:00
Matteo Pagliazzi
4a37bec652 fix(pr): indentation and simplify 2014-12-29 21:21:54 +01:00
Matteo Pagliazzi
752161b284 Merge branch 'dateformat' of git://github.com/Verabird/habitrpg into Verabird-dateformat 2014-12-29 21:09:04 +01:00
Blade Barringer
760381041f Added transparent class to gem purchasing if zero gems are available for purchase 2014-12-29 11:18:01 -06:00
Melissa Mcewen
8bdc0d55b9 Private Message (PM / DM) textbox is too small #4425 2014-12-28 23:53:15 -06:00
Melissa Mcewen
c4e62fc79b Private Message (PM / DM) textbox is too small #4425 2014-12-28 23:51:37 -06:00
Melissa Mcewen
f8cdcd2e75 Inconsistent alignment of Gem prices in Seasonal Shop #4434 2014-12-28 23:35:47 -06:00
Andy Zinsser
1a4455550d Remove duplicate equipment-tab classes 2014-12-27 17:49:58 -08:00
Negue
a082e88b5d Filter Array only once and one time binding - closes #4429 2014-12-27 23:26:30 +01:00
Blade Barringer
72d4bf2bf5 Merge pull request #4423 from andyzinsser/fix-no-food-text-color 
Add muted class when no food is in inventory
 2014-12-26 20:47:15 -06:00
Andy Zinsser
db6f52e4b5 Add muted class when no food is in inventory 2014-12-26 18:31:21 -08:00