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

6221 commits

This branch
This branch
All branches
Author SHA1 Message Date
scribblypanda
9fe93351ae applied .muted to text so less cluttered looking 2015-01-14 22:38:02 -05:00
scribblypanda
273dc4909f Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into issue4468 2015-01-14 22:29:07 -05: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
Sabe Jones
04ff888819 fix(world-boss): Scale based on current HP 2015-01-13 13:19:04 -06:00
Sabe Jones
f00e1bc660 Merge pull request #4510 from SabreCat/stressbeast 
Stressbeast healing on rage
 2015-01-13 12:06:12 -06:00
Sabe Jones
ad7c02d50d feat(world-boss): Healing on rage 2015-01-13 11:49:16 -06:00
Blade Barringer
385fe36a0a Merge branch 'develop' of github.com:HabitRPG/habitrpg into mountmaster 2015-01-12 21:50:14 -06:00
scribblypanda
9456653263 Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into issue4468 
Hopefully this doesn't break anything...
 2015-01-12 21:36:44 -05:00
Alice Harris
86c25085fc Merge remote-tracking branch 'upstream/develop' into fix-chat-visibility-2015-01-13 2015-01-13 07:53:52 +10:00
Alice Harris
0bd22e7c77 disallow fetching of chat messages 2015-01-13 06:10:46 +10:00
Blade Barringer
1557907a1c Updated string names 2015-01-12 13:12:40 -06:00
Tyler Renelle
ca2d45113c fix(billing): script to fix current_period_end, see #4420 2015-01-12 11:50:46 -07:00
scribblypanda
8e3e66dc08 added description of login name and link to page to edit display name 2015-01-11 20:30:25 -05:00
scribblypanda
393ef6b1f4 added description of display name and link to page to edit login name 2015-01-11 20:17:05 -05:00
Blade Barringer
a72ae097d6 Corrected how count is calculated 2015-01-11 18:23:27 -06:00
Blade Barringer
f6885427a8 Corrected Beast Master and Mount Master count so it would be accurate. 2015-01-11 17:24:01 -06:00
Blade Barringer
11f20555c4 Corrected stats page to show profile data instead of user data 2015-01-11 17:23:30 -06:00
scribblypanda
684c6a997d fixed emailChange message, displays properly on localhost 2015-01-11 13:18:00 -05:00
scribblypanda
d560bacd32 plain text to translatable strings 2015-01-11 10:36:14 -05:00
scribblypanda
9907379a60 plain text to translatable strings 2015-01-11 10:22:24 -05:00
scribblypanda
998fe684e4 added new translatable string emailChange 2015-01-11 03:20:22 -05:00
scribblypanda
c3fce5fcba changed Username to Login Name 2015-01-11 01:18:37 -05: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
Blade Barringer
c9f5113daa Merge pull request #4486 from kangabell/spell-active-highlight 
Give greater indication to which spell is currently being cast.
 2015-01-10 11:59:35 -06: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
1e11947c9e Removed unnecessary comment 2015-01-10 09:52:51 -06:00
Blade Barringer
819ab0b6e1 Added updated mountCount to releaseBoth function 2015-01-10 09:52:09 -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
K Bell
0f2adcad14 highlight spell item when it has class of 'active' 2015-01-10 10:35:27 -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
0f3d6bc751 Explicitly reset mountCount to 0. (Otherwise, will not reset until refresh) 2015-01-10 09:24:30 -06:00
Blade Barringer
a5d6c9de3f Force update of mountCount after feedling 2015-01-10 09:22:53 -06:00
Blade Barringer
c6ef4b52ab The inventory controllers watch on mounts was creating an inaccurate count (was counting quest and special mounts) 2015-01-10 09:03:59 -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
Sabe Jones
689b13ecb6 fix(world-boss): Justin not stressed yet 2015-01-09 10:00:16 -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