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

9193 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Matteo Pagliazzi 5eda9a34b7 chore(grunt): compile 2015-01-05 19:20:22 +01:00
Brandon Reid 15eb64c7d2 Fixed cron dayStart option. 
Wrote test cases to verify fix.
Fixed test cases that were incorrect.
 2015-01-05 19:20:21 +01:00
Matteo Pagliazzi a65c675243 chore(i18n): add hungarian and update locales 2015-01-05 17:31:26 +01: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 a54e1cd448 Compiled version of adjustment to spells 2015-01-04 16:15:36 -06:00
Blade Barringer ff3d942696 Merge branch 'issue4454try' of https://github.com/melissamcewen/habitrpg into melissamcewen-issue4454try 2015-01-04 16:11:22 -06:00
Blade Barringer 5d6da27a70 Merge branch 'issue4454habitrpg' of https://github.com/melissamcewen/habitrpg-shared into melissamcewen-issue4454habitrpg 2015-01-04 16:10:30 -06:00
Alice Harris 5ffb35485b removed comments (outdated or inaccurate) 2015-01-04 15:38:30 +10: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
Tyler Renelle 8b4c6c450b Revert "revert last commit" 
This reverts commit 0cc87d4ea0.
 2015-01-03 13:59:13 -07:00
Sabe Jones 09f827e9fe fix(news): Improved plot 2015-01-03 13:18:47 -06:00
Alice Harris 184cb69ce1 Merge pull request #426 from Verabird/AddDimRet 
Add diminishing Returns to several skills
 2015-01-03 13:07:44 +10:00
Alice Harris 04bc0a02b3 Merge remote-tracking branch 'upstream/rebalancing-2014-12' into rebalancing-2014-12 2015-01-03 13:01:17 +10:00
Alice Harris ac08549f84 Merge remote-tracking branch 'upstream/develop' into rebalancing-2014-12 
Conflicts:
	dist/habitrpg-shared.js
 2015-01-03 13:01:01 +10: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
Blade Barringer 19fc403b2f Clarified comments in user model 2015-01-02 15:26:16 -06:00
Blade Barringer 45c045e853 Corrected which string was being used in achievements 2015-01-02 14:16:40 -06:00
Blade Barringer b042c3e723 Compiled coffeescript for release scripts 2015-01-02 14:13:56 -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 b69182f777 Added mountCount variable for easy access 2015-01-02 14:10:52 -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 0053dd67bd Adjusted translation key text, added a new one for releasing both. Added 
releaseBoth function
 2015-01-02 13:20:58 -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 312aa11272 Refactored release scripts 2015-01-02 12:41:36 -06:00
Matteo Pagliazzi 0cc87d4ea0 revert last commit 2015-01-02 19:07:31 +01:00
Matteo Pagliazzi d362003cdf fix json 2015-01-02 18:52:14 +01:00
Matteo Pagliazzi 1f258e601c move spritesmith and phantomjs to dev dependencies 2015-01-02 18:50:39 +01:00
Matteo Pagliazzi 3e0118a25a Merge pull request #4463 from negue/contentTranslation 
maybe fixes the multilingual content result
 2015-01-02 15:23:23 +01:00
Matteo Pagliazzi edbfc24b08 fix(i18n): remove duplicate strings cc @negue 2015-01-02 12:45:40 +01:00
Blade Barringer 914c780053 Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop 2015-01-01 23:23:08 -06:00
Blade Barringer 33abd30217 Adjusted look of gem wallet in modal 2015-01-01 23:22:40 -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
Sabe Jones 83559c5d98 chore(January): Jan updates 
Reverts New Year's NPCs to normal winter garb and updates the Mystery Item package to its January scheme.
 2015-01-01 23:18:18 -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 ea56c807ad Adjusted text of quests for beast master and mount master to be more descriptive 2015-01-01 22:12:00 -06:00
Blade Barringer 9767917b98 Added tests for mount master 2015-01-01 22:08:58 -06:00
Blade Barringer 6807368c5c Removed comment 2015-01-01 21:29:27 -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