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

6237 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Tyler Renelle
6626103d06 chore(cores): allow cores==0 to not use cluster at all (even w/ single 
core). Good for running debugger. If cores==1, it will use cluster to
restart the single node on error
 2015-01-08 13:19:11 -07:00
Blade Barringer
0807e7856c Merge remote-tracking branch 'upstream/develop' into mountmaster 2015-01-08 11:31:45 -06:00
Tyler Renelle
0b28f6df55 fix(plans): when gifting subscription, set plan.dateUpdated so it can 
roll gemCapExtra next month. Fixes #4480
 2015-01-07 14:59:38 -07:00
Blade Barringer
c96ae618db Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop 2015-01-07 10:32:58 -06:00
Blade Barringer
eca252a269 Corrected moment code to use new format instead of depreciating format 2015-01-07 10:28:46 -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
Matteo Pagliazzi
b854663b92 fix(loggly): do not pass apiKey 2015-01-06 09:05:30 +01: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
Alice Harris
dc7c6f8625 Merge pull request #4476 from jdpopkin/stat_tooltips_3223 
Add tooltip with exact health/exp/mana
 2015-01-05 18:06:57 +10:00
Jackson Popkin
b409e589f1 Add tooltip with exact health/exp/mana 2015-01-04 17:26:11 -05:00
Blade Barringer
ff3d942696 Merge branch 'issue4454try' of https://github.com/melissamcewen/habitrpg into melissamcewen-issue4454try 2015-01-04 16:11:22 -06:00
Tyler Renelle
fe1672e82d Merge pull request #4441 from crookedneighbor/stripe-name-error 
Stripe name error
 2015-01-03 15:25:29 -07:00
negue
d5eb5bbfe0 fix(content): Cannot call 'toString' of undefined 2015-01-03 23:20:16 +01:00
Tyler Renelle
a98f73dd8d tmp(newrelic) remove newrelic until #4471 fixed 2015-01-03 13:59:56 -07:00
Sabe Jones
09f827e9fe fix(news): Improved plot 2015-01-03 13:18:47 -06:00
Blade Barringer
6441888d3f Moved mountMaster watch to feeding function 2015-01-02 19:09:50 -06:00
Blade Barringer
9b82da064f Moved the beastMaster modal alert from notifications to inside the hatching function 2015-01-02 18:52:25 -06:00
Blade Barringer
e1494b3860 Added Shared as one of the injections 2015-01-02 18:51:51 -06:00