4a7dcfc2bb
merge changes for smash (Brutal Smash) from brandonjreid's PR https://github.com/HabitRPG/habitrpg-shared/pull/331
2014-12-20 21:13:43 +10:00
e9c8f66562
merge backStab change by brandonjreid from https://github.com/HabitRPG/habitrpg-shared/pull/331
2014-12-20 16:03:37 +10:00
fbc5a258f6
stop backStab and fireball (Burst of Flames) changing the task value
2014-12-20 13:35:10 +10:00
44a7448a96
compiled dist/habitrpg-shared.js
2014-12-20 11:18:13 +10:00
9f77819d94
add pickpocket change from PR by brandonjreid: https://github.com/HabitRPG/habitrpg-shared/pull/331/files#diff-652dbbf3d459e90a3de1a122c063bb6bL502
2014-12-20 11:07:47 +10:00
afef118200
Merge toolsOfTrade changes from 'ShilohT-skillbalancing' into rebalancing-2014-12
2014-12-20 09:46:30 +10:00
621615a6f9
Merge fireball (Burst of Flames) changes from 'ShilohT-skillbalancing' into rebalancing-2014-12
2014-12-20 09:42:26 +10:00
6961e3608a
Merge branch 'skillbalancing' of https://github.com/ShilohT/habitrpg-shared into ShilohT-skillbalancing
2014-12-20 09:29:52 +10:00
95a6aa5586
Merge branch 'rebalancing-2014-12' of https://github.com/HabitRPG/habitrpg-shared into rebalancing-2014-12
...
Conflicts:
dist/habitrpg-shared.js
2014-12-20 08:48:21 +10:00
486d8a9bbf
chore(i18n): update locales
2014-12-18 22:56:34 +01:00
1fe3664731
ran grunt to compile coffeescript
2014-12-18 14:01:31 -06:00
e1d44cc54f
HabitRPG/habitrpg#3260 Buttonless habit full width
...
When the user has neither a plus nor a minus button on
one of their habits, the habit’s title will now span the entire
width of the task div instead of having a gap to the left.
2014-12-18 14:01:31 -06:00
4f5e813fcf
Merge pull request #396 from jamesleonis/develop
...
Incorrect grammar in Vice 2 quest notes
2014-12-18 19:48:46 +10:00
c308f6cf9f
Incorrect grammar in Vice 2 quest notes
...
"makes it's way to Mt. Habitica" to "makes its way to Mt. Habitica"
2014-12-18 01:01:18 -08:00
30e5e2096a
grunt full
2014-12-17 21:53:27 -07:00
09ba5384f8
Merge pull request #395 from SabreCat/seasonal
...
fix(seasonal): Leslie link
2014-12-17 18:38:32 -06:00
6e77392e7a
fix(seasonal): Leslie link
2014-12-17 18:26:52 -06:00
cbfd043b2c
Merge pull request #394 from SabreCat/seasonal
...
Seasonal Shop Basics
2014-12-16 21:52:28 -06:00
059f719461
Merge pull request #231 from wc8/patch-1
...
innText update of groups.json to call username
2014-12-16 14:16:26 -07:00
19930226c7
chore(grunt): grunt
2014-12-14 14:24:37 -06:00
c7ee171ee4
feat(seasonal): Seasonal shop
...
Initial commit of resources for the Seasonal Shop feature.
2014-12-14 13:33:10 -06:00
0352adfd47
Merge pull request #393 from SabreCat/timetravel
...
Translate Time Travelers
2014-12-14 13:27:48 -06:00
8d042745be
fix(I18N): Translate Time Travelers
2014-12-14 12:57:36 -06:00
fd3cbf481d
Merge pull request #390 from lacrimae/develop
...
Streamlined "Confers no benefit" placements
2014-12-14 11:02:45 -06:00
ff8a508860
Streamlined "Confers no benefit" placements
2014-12-14 13:32:44 +01:00
5368d3b760
Merge pull request #389 from lacrimae/develop
...
Pull req: Clarifying spell effects on attributes
2014-12-13 10:31:50 +10:00
118a5432e5
Merge branch 'develop' of https://github.com/lacrimae/habitrpg-shared into develop
2014-12-13 00:16:24 +01:00
a15c57c275
Accidentally a dash
2014-12-13 00:15:46 +01:00
63263bbf3a
Spells now mention which attribute they affect
...
https://github.com/HabitRPG/habitrpg-shared/issues/380
2014-12-13 00:15:46 +01:00
60d03dd17f
Merge pull request #387 from SabreCat/rebalancing
...
Implement boss damage from Habits
2014-12-13 05:27:00 +10:00
96157068cf
chore(grunt): grunt
2014-12-11 19:58:14 -06:00
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
af01065da6
Merge pull request #385 from SabreCat/rebalancing
...
MP gain revisions
2014-12-11 14:06:06 +10:00
11ec69674c
chore(grunt): grunt
2014-12-10 21:49:40 -06:00
2fc0cb8fa1
fix(scoring): move gainMP into score
2014-12-10 21:45:51 -06:00
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
d2e5f60dd4
Added inbox as a env.t var
2014-12-10 10:46:36 -06:00
842289ffdf
Merge pull request #384 from SabreCat/penguin
...
Penguin quest
2014-12-09 21:23:19 -06:00
ac2ce59873
chore(grunt): grunt
2014-12-09 21:16:00 -06:00
c6d3d72e00
fix(sprites): Move penguins 3px
2014-12-09 21:08:13 -06:00
5cd6c02e8a
fix(quest): Dapper to perspicacious
2014-12-09 20:56:38 -06:00
7fd4cebbdc
fix(quest): Penguin corrections
...
Fix missing egg item and line breaks in quest text
2014-12-09 20:44:10 -06:00
d25455fa5a
feat(quest): Implement Penguin pet quest
2014-12-09 20:21:20 -06:00
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
af130a701c
Diminish critical hit bonus towards 450%
2014-12-10 07:03:32 +08:00
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
9a60fc7ca8
Accidentally a dash
2014-12-08 01:02:14 +01:00
d27dc29607
Spells now mention which attribute they affect
...
https://github.com/HabitRPG/habitrpg-shared/issues/380
2014-12-08 01:01:06 +01:00
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
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
Alice Harris