Commit Graph

1536 Commits

Author SHA1 Message Date
Sabe Jones 43dcded051 feat(quests): Boss damage from Habits
+ Habit hits now damage bosses at half the strength of Dailies and To-Dos. Also removed a bit of leftover commentary/logic from back when STR caused tasks to get blue faster.
2014-12-11 19:50:46 -06:00
Alice Harris af01065da6 Merge pull request #385 from SabreCat/rebalancing
MP gain revisions
2014-12-11 14:06:06 +10:00
Sabe Jones 11ec69674c chore(grunt): grunt 2014-12-10 21:49:40 -06:00
Sabe Jones 2fc0cb8fa1 fix(scoring): move gainMP into score 2014-12-10 21:45:51 -06:00
Sabe Jones 7b22244f01 feat(scoring): MP gain from Habits and Dailies
Turns MP gain from tasks into a function, and calls the function with varying inputs from Habits (1/4 gain), Dailies (normal gain), and To-Dos (normal gain multiplied by checklist completion).
2014-12-10 21:21:09 -06:00
Alice Harris 935dc2cd2e Merge pull request #383 from betaveros/cap-crit-multiplier-cp
Diminish critical hit bonus towards 450% (rebalancing-2014-12 copy)
2014-12-10 12:06:39 +10:00
Brian Chen af130a701c Diminish critical hit bonus towards 450% 2014-12-10 07:03:32 +08:00
Paul Klipp 3d2c7e8854 Fixed a grammar error in the Golden Knight 2 quest
Changed “Perhaps I will shall . . . “ to “Perhaps I will . . . “
2014-12-08 12:19:08 -06:00
Blade Barringer 6739ec25a3 Merge pull request #379 from andymantell/feature/linking-timetravellers-names
Link for Tyler and Vicky's names
2014-12-06 16:48:00 -06:00
Tyler Renelle 3de86f35cb fix(plans): attempted fix for: Cast to number failed for value "NaN" at
path "purchased.plan.consecutive.count", see https://github.com/HabitRPG/habitrpg/issues/4317
2014-12-06 12:49:19 -07:00
Matteo Pagliazzi 17f9d4de72 fix(i18n): fix english string 2014-12-06 19:18:28 +01:00
Andy Mantell 82cea43e07 Link for Tyler and Vicky's names 2014-12-06 15:42:32 +00:00
Blade Barringer b23a76f8c8 Merge pull request #365 from crookedneighbor/fix-moment-deprication-warnings-on-tests
Corrected ordering of arguments for moment().add and moment().subtract
2014-12-06 00:56:16 -06:00
Tyler Renelle 2018cc84ab fix(gem-cap) use customerId in gem purchase 2014-12-05 15:11:27 -07:00
Matteo Pagliazzi f010bd7ad9 chore(i18n): update locales 2014-12-05 16:21:13 +01:00
Matteo Pagliazzi 09aeaf2812 Merge branch 'crookedneighbor-translate-mystic-items' into develop 2014-12-05 16:06:51 +01:00
Matteo Pagliazzi 198d41d5e8 fix(pr): conflicts 2014-12-05 16:06:15 +01:00
Sabe Jones 4aacc103db Merge pull request #377 from SabreCat/gems
Prettify Market Gem
2014-12-04 20:31:45 -06:00
Sabe Jones a0434e67a6 Revert "fix(style): Pet key margins like sub gems"
This reverts commit d584e998ba.
2014-12-04 20:26:27 -06:00
Sabe Jones d584e998ba fix(style): Pet key margins like sub gems 2014-12-04 20:14:16 -06:00
Blade Barringer 6dac81f850 Corrected strings so they only used on variable 2014-12-04 20:03:17 -06:00
Sabe Jones 6369934ca3 feat(Gems): Add strings for Market gem 2014-12-04 19:04:07 -06:00
Blade Barringer a55fa37412 Converted strings to be able to use links 2014-12-03 22:46:41 -06:00
Blade Barringer 2e2faa6117 Moved pre-subscription time travelers title and popover to shared 2014-12-03 22:24:43 -06:00
Blade Barringer 87092e8109 Added mystic hourglass and time travelers screens 2014-12-03 22:19:33 -06:00
Sabe Jones cc32369497 fix(style): Prettify Market Gem 2014-12-03 22:10:35 -06:00
Tyler Renelle 6ac6f4d476 fix(plans): fix conversion cap 2014-12-03 20:24:35 -07:00
Tyler Renelle 9e64bc3788 fix(plans): move plan reset up for people in inn 2014-12-03 20:16:33 -07:00
Tyler Renelle 9d3e6c71fe fix(plans): possible safe-check of gemcapextra cc @Sabrecat 2014-12-03 20:03:40 -07:00
Tyler Renelle cb8c1359c4 fix(plans): mystery 3014 promo 2014-12-03 19:24:26 -07:00
Tyler Renelle 78a4edb38a i18n(plans): update wording cc @Alys 2014-12-03 19:14:27 -07:00
Tyler Renelle 3dd775235d fix(): remove some logs 2014-12-03 19:05:54 -07:00
Tyler Renelle a62a09d7d2 Merge pull request #376 from HabitRPG/block-subs
Block Subscriptions
2014-12-03 16:02:14 -07:00
Tyler Renelle bf7e1e66ed feat(plans): time traveler - by full sets 2014-12-03 15:24:08 -07:00
Tyler Renelle d81badde69 feat(plans): add time traveler - buy individual mystery items 2014-12-03 15:24:08 -07:00
Tyler Renelle 76be625f6d feat(plans): add consecutive-month benefits for subscribers 2014-12-03 15:24:08 -07:00
Sabe Jones a6944ec072 Merge pull request #375 from SabreCat/develop
December backgrounds
2014-11-30 23:20:22 -06:00
Sabe Jones d7b904efec chore(December): grunt 2014-11-30 23:08:53 -06:00
Sabe Jones 4d8a9c5287 feat(backgrounds): December purchasables 2014-11-30 22:54:37 -06:00
Tyler Renelle 703451d452 fix(mystery): typo 2014-11-30 14:11:49 -07:00
Matteo Pagliazzi f7c6e9063b chore(i18n): update locales 2014-11-30 21:59:49 +01:00
Matteo Pagliazzi aa6afcdce8 chore(i18n): update locales 2014-11-30 20:21:59 +01:00
Tyler Renelle 192110e25a grunt 2014-11-29 09:04:58 -07:00
Tyler Renelle 5ee9f4904a Merge remote-tracking branch 'remotes/Alys/eyewear1' into develop
Conflicts:
	locales/en/gear.json
2014-11-29 08:26:23 -07:00
Alice Harris e4478355bc Merge pull request #372 from ShilohT/gear
Standardization of locales/en/gear.json
2014-11-29 21:00:12 +10:00
Tyler Renelle eb27a76709 feat(thanksgiving): revert npcs back to normal 2014-11-28 18:34:36 -07:00
Tyler Renelle 17f3868b96 Merge pull request #374 from SabreCat/turkey
Give Alex and Bailey their Thanksgiving costumes
2014-11-27 12:13:05 -07:00
Tyler Renelle 60bf777668 grunt 2014-11-27 12:11:14 -07:00
Sabe Jones a4a94f7973 fix(event): grunt 2014-11-27 09:13:20 -06:00
Sabe Jones d37dd90484 fix(event): Festify missed NPCs 2014-11-27 09:05:21 -06:00