Commit graph

  • c6ef4b52ab The inventory controllers watch on mounts was creating an inaccurate count (was counting quest and special mounts) Blade Barringer 2015-01-10 09:03:59 -0600
  • 7f20ca7d8b Made title dynamic Blade Barringer 2015-01-10 08:26:11 -0600
  • 06a89f67d7 Added title to keys heading. Allows dynamic display of beast master and or mount master Blade Barringer 2015-01-10 08:25:17 -0600
  • 38f7c1e634 Closes #4490. Day start saves on blur instead of change Blade Barringer 2015-01-09 19:10:10 -0600
  • dc37442691 Merge pull request #4478 from crookedneighbor/cmd-enter-for-chat Blade Barringer 2015-01-09 13:51:21 -0600
  • 64bb55e57b Reworked mixin file to retain gembutton history Blade Barringer 2015-01-09 13:48:19 -0600
  • ebfab32c0f doubled multiplier on CON buffs and changed multiplier on searing brightness from 1.5 to 4 Verabird 2015-01-09 14:09:02 -0500
  • a61c4c1b18 Wrote in ng-if to hide the mp if user has not chosen a class Blade Barringer 2015-01-09 10:09:07 -0600
  • 689b13ecb6 fix(world-boss): Justin not stressed yet Sabe Jones 2015-01-09 10:00:16 -0600
  • 9b0d854855 Changed calculation to use profile instead of logged in user (duh) Blade Barringer 2015-01-09 09:56:53 -0600
  • 2d0d2cedd9 Converted floor mechanism to filter to match health calculation Blade Barringer 2015-01-09 09:50:13 -0600
  • 34bd7cb879 Added mana to stats page Blade Barringer 2015-01-09 09:47:06 -0600
  • fd7ba143cc Merge pull request #432 from SabreCat/stressbeast Sabe Jones 2015-01-08 15:51:23 -0600
  • cda16d5bc0 Merge pull request #4494 from SabreCat/stressbeast Sabe Jones 2015-01-08 15:51:04 -0600
  • 41d073d181 fix(world-boss): Achievement badge Sabe Jones 2015-01-08 15:47:48 -0600
  • 8bd32e0f35 chore(grunt): grunt full Sabe Jones 2015-01-08 15:29:41 -0600
  • fde64b0bdf feat(event): World Boss Sabe Jones 2015-01-08 15:24:26 -0600
  • ee339fba4a feat(event): World boss Sabe Jones 2015-01-08 15:22:42 -0600
  • cba232ef83 feat(presskit): add presskit page cc @lemoness Tyler Renelle 2015-01-08 13:41:23 -0700
  • 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 Tyler Renelle 2015-01-08 13:19:11 -0700
  • 0807e7856c Merge remote-tracking branch 'upstream/develop' into mountmaster Blade Barringer 2015-01-08 11:31:45 -0600
  • 8f90d154a0 Merge remote-tracking branch 'upstream/develop' into mountmaster Blade Barringer 2015-01-08 11:30:53 -0600
  • 0b28f6df55 fix(plans): when gifting subscription, set plan.dateUpdated so it can roll gemCapExtra next month. Fixes #4480 Tyler Renelle 2015-01-07 14:58:58 -0700
  • c96ae618db Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop Blade Barringer 2015-01-07 10:32:58 -0600
  • eca252a269 Corrected moment code to use new format instead of depreciating format Blade Barringer 2015-01-07 10:28:46 -0600
  • 54a9df4619 test(cron): setup failing test for changing cds to an hour past last cron Matteo Pagliazzi 2015-01-07 16:52:04 +0100
  • 193b92c16b fix(cds): max hour is 23 not 24 Matteo Pagliazzi 2015-01-06 23:12:03 +0100
  • 8ba0bb5d88 Changed spellObj to skill to be more semantic, and match the text in the rewards column Blade Barringer 2015-01-06 15:31:07 -0600
  • 870d9d7e86 Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop Blade Barringer 2015-01-06 15:04:47 -0600
  • 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) Blade Barringer 2015-01-06 15:03:54 -0600
  • 96b48324f8 Merge pull request #4484 from crookedneighbor/fix-for-date-on-tasks Blade Barringer 2015-01-06 14:29:16 -0600
  • 53c466ee7f Rounds tooltip for exp, health and mana to 2 decimal places Blade Barringer 2015-01-06 13:52:22 -0600
  • e416b03a59 Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop Blade Barringer 2015-01-06 09:39:04 -0600
  • dd4e8d74c7 Fix for truncated dates on task due date. Closes #4482 Blade Barringer 2015-01-06 09:37:29 -0600
  • f4b72c088f chore(i18n): add danish and update locales Matteo Pagliazzi 2015-01-06 15:59:20 +0100
  • b854663b92 fix(loggly): do not pass apiKey Matteo Pagliazzi 2015-01-06 09:05:30 +0100
  • d63cc4da8f merge cron-fix Matteo Pagliazzi 2015-01-06 08:55:48 +0100
  • ab66f95c8e Merge remote-tracking branch 'upstream/develop' into rebalancing-2014-12 Alice Harris 2015-01-06 15:26:59 +1000
  • b5de2ebf4b Merge pull request #430 from scribblypanda/develop deilann 2015-01-05 20:50:47 -0800
  • 9ab3849502 grunt Tyler Renelle 2015-01-05 21:33:14 -0700
  • 2718fd39e3 off-hand to shield-hand in gear.json and questsContent.json scribblypanda 2015-01-05 23:27:04 -0500
  • 8feffa5431 fix(news): Improve accuracy Sabe Jones 2015-01-05 17:31:19 -0600
  • f0c65be629 Fix to allow for challenges with the same award name. Closes #4479 Blade Barringer 2015-01-05 16:33:36 -0600
  • 61b827183b fix(grunt): Push CSS Sabe Jones 2015-01-05 17:15:05 -0600
  • 97a48eb66e chore(grunt): grunt full Sabe Jones 2015-01-05 17:00:17 -0600
  • 8529c0f1db chore(news): Bailey Sabe Jones 2015-01-05 16:48:58 -0600
  • 285ff6228c fix(backgrounds): Frigid, not Snowy, Peak Sabe Jones 2015-01-05 16:41:23 -0600
  • 0bfc5b37c0 feat(backgrounds): January backgrounds Sabe Jones 2015-01-05 16:36:11 -0600
  • aa6b1e3f81 add remove-watch to markdown-directive negue 2015-01-05 22:19:05 +0100
  • ad8add58d7 Merge pull request #4461 from negue/markdownText negue 2015-01-05 22:12:06 +0100
  • 1bdacffe96 Merge pull request #428 from negue/markdownDirective negue 2015-01-05 22:11:38 +0100
  • cc7b2f70ba Hide buy gems button if over level 100 in rebirth modal Blade Barringer 2015-01-05 13:41:58 -0600
  • 10451d3296 Removed gem cost if lv 100 or higher Blade Barringer 2015-01-05 13:38:00 -0600
  • f3676fcbf4 Added spaces between quantity and gem symbol Blade Barringer 2015-01-05 13:33:43 -0600
  • a72faa5d92 Added ctrl+cmd enter command to pms Blade Barringer 2015-01-05 13:21:23 -0600
  • 5deb72c457 Added ability to send chat via cmd/ctrl + enter Blade Barringer 2015-01-05 13:17:23 -0600
  • 5eda9a34b7 chore(grunt): compile Matteo Pagliazzi 2014-12-19 21:47:39 +0100
  • 15eb64c7d2 Fixed cron dayStart option. Wrote test cases to verify fix. Fixed test cases that were incorrect. Brandon Reid 2014-10-10 09:42:53 -0600
  • a65c675243 chore(i18n): add hungarian and update locales Matteo Pagliazzi 2015-01-05 17:31:26 +0100
  • dc7c6f8625 Merge pull request #4476 from jdpopkin/stat_tooltips_3223 Alice Harris 2015-01-05 18:06:57 +1000
  • b409e589f1 Add tooltip with exact health/exp/mana Jackson Popkin 2015-01-04 16:25:19 -0500
  • a54e1cd448 Compiled version of adjustment to spells Blade Barringer 2015-01-04 16:15:36 -0600
  • ff3d942696 Merge branch 'issue4454try' of https://github.com/melissamcewen/habitrpg into melissamcewen-issue4454try Blade Barringer 2015-01-04 16:11:22 -0600
  • 5d6da27a70 Merge branch 'issue4454habitrpg' of https://github.com/melissamcewen/habitrpg-shared into melissamcewen-issue4454habitrpg Blade Barringer 2015-01-04 16:10:30 -0600
  • 5ffb35485b removed comments (outdated or inaccurate) Alice Harris 2015-01-04 15:38:30 +1000
  • fe1672e82d Merge pull request #4441 from crookedneighbor/stripe-name-error Tyler Renelle 2015-01-03 15:25:29 -0700
  • d5eb5bbfe0 fix(content): Cannot call 'toString' of undefined negue 2015-01-03 23:20:16 +0100
  • a98f73dd8d tmp(newrelic) remove newrelic until #4471 fixed Tyler Renelle 2015-01-03 13:59:56 -0700
  • 8b4c6c450b Revert "revert last commit" Tyler Renelle 2015-01-03 13:59:13 -0700
  • 09f827e9fe fix(news): Improved plot Sabe Jones 2015-01-03 13:18:47 -0600
  • 184cb69ce1 Merge pull request #426 from Verabird/AddDimRet Alice Harris 2015-01-03 13:07:44 +1000
  • 04bc0a02b3 Merge remote-tracking branch 'upstream/rebalancing-2014-12' into rebalancing-2014-12 Alice Harris 2015-01-03 13:01:17 +1000
  • ac08549f84 Merge remote-tracking branch 'upstream/develop' into rebalancing-2014-12 Alice Harris 2015-01-03 13:01:01 +1000
  • 6441888d3f Moved mountMaster watch to feeding function Blade Barringer 2015-01-02 19:09:50 -0600
  • 9b82da064f Moved the beastMaster modal alert from notifications to inside the hatching function Blade Barringer 2015-01-02 18:52:25 -0600
  • e1494b3860 Added Shared as one of the injections Blade Barringer 2015-01-02 18:51:51 -0600
  • 19fc403b2f Clarified comments in user model Blade Barringer 2015-01-02 15:26:16 -0600
  • 45c045e853 Corrected which string was being used in achievements Blade Barringer 2015-01-02 14:16:40 -0600
  • b042c3e723 Compiled coffeescript for release scripts Blade Barringer 2015-01-02 14:13:56 -0600
  • 68e613c3fc Simplified count checks in keys to the kennel modal. Adjusted balance for releaseBoth to be correct Blade Barringer 2015-01-02 14:11:59 -0600
  • 3c3bbcafb9 Simplified count in stable Blade Barringer 2015-01-02 14:11:04 -0600
  • b69182f777 Added mountCount variable for easy access Blade Barringer 2015-01-02 14:10:52 -0600
  • 87d78618d8 Changed keys of the kennel npc to Matt Blade Barringer 2015-01-02 13:46:21 -0600
  • 406edcb761 Added releaseBoth script and refactored keys to the kennel modal Blade Barringer 2015-01-02 13:33:41 -0600
  • 0053dd67bd Adjusted translation key text, added a new one for releasing both. Added releaseBoth function Blade Barringer 2015-01-02 13:20:25 -0600
  • 1049e5e152 Key shows up when you have either 90 pets or 90 mounts. Opens lg modal Blade Barringer 2015-01-02 13:08:45 -0600
  • 7f2648eafb Renamed release scripts Blade Barringer 2015-01-02 12:43:40 -0600
  • 312aa11272 Refactored release scripts Blade Barringer 2015-01-02 12:41:36 -0600
  • 0cc87d4ea0 revert last commit Matteo Pagliazzi 2015-01-02 19:07:31 +0100
  • d362003cdf fix json Matteo Pagliazzi 2015-01-02 18:52:14 +0100
  • 1f258e601c move spritesmith and phantomjs to dev dependencies Matteo Pagliazzi 2015-01-02 18:50:39 +0100
  • 3e0118a25a Merge pull request #4463 from negue/contentTranslation Matteo Pagliazzi 2015-01-02 15:23:23 +0100
  • edbfc24b08 fix(i18n): remove duplicate strings cc @negue Matteo Pagliazzi 2015-01-02 12:45:40 +0100
  • 914c780053 Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop Blade Barringer 2015-01-01 23:23:08 -0600
  • 33abd30217 Adjusted look of gem wallet in modal Blade Barringer 2015-01-01 23:22:40 -0600
  • 3a0de8f9c4 chore(January): news and deactivate cards Sabe Jones 2015-01-01 23:01:23 -0600
  • fc4e43bef8 Merge branch '4401_multiple_buy_gems_popups_with_mixins' of https://github.com/lucymhdavies/habitrpg into gems-mixin Blade Barringer 2015-01-01 23:18:28 -0600
  • 83559c5d98 chore(January): Jan updates Sabe Jones 2015-01-01 23:18:18 -0600
  • c561562009 Merge branch 'lucymhdavies-4401_multiple_buy_gems_popups' into develop closes #4401 Blade Barringer 2015-01-01 23:12:10 -0600
  • ea56c807ad Adjusted text of quests for beast master and mount master to be more descriptive Blade Barringer 2015-01-01 22:12:00 -0600