2f072d8e96
Merge branch 'StealthMod' of https://github.com/Verabird/habitrpg into rebalancing-2015-03-2
...
Conflicts:
common/script/index.coffee
2015-03-14 18:54:18 +10:00
627b07ef86
Rebalance stealth diminishing returns again
2015-03-13 16:45:00 -04:00
fbeb83e836
Rescale stealth to strengthen
2015-03-13 11:38:34 -04:00
180d87e9c7
removed commented out old stealth code
2015-03-13 10:53:29 -04:00
4a0f165af8
Modify daily checklists to stay checked at cron if inactive and Stealth to only apply to active dailys
2015-03-13 10:53:29 -04:00
f58e7ef931
compile habitrpg-shared.js
2015-03-13 20:58:43 +10:00
6cf815ba22
Merge remote-tracking branch 'upstream/develop' into rebalancing-2015-03
...
Conflicts:
common/dist/scripts/habitrpg-shared.js
2015-03-13 20:23:28 +10:00
8bc5ed83cb
chore(i18n): update locales
2015-03-12 16:26:45 +01:00
9ac0ef0202
explain when survey participants will get their badge
2015-03-12 07:34:01 +10:00
de67f44e1f
Merge pull request #4713 from HabitRPG/lefnire/interactive-tour
...
Interactive Tour
2015-03-10 19:23:01 -06:00
9cfa27f089
feat(surveys): Survey achievement
...
Updates the "Helped Habit Grow" achievement to be stackable. Also includes miscellaneous Bailey announcements for 3/10.
2015-03-10 18:39:00 -05:00
3bd0b57efa
add semi-colon at end of line; remove apostrophe from comment
2015-03-11 09:29:44 +10:00
63c57cce5d
Merge pull request #4785 from AAorris/develop
...
Allow for client notifications to user settings
2015-03-11 08:20:51 +10:00
16e996c971
fix(interactive-tour): "Buy the Training Sword"
2015-03-10 15:40:19 -06:00
63a6af6e0a
fix(interactive-tour): small updates per
...
https://github.com/HabitRPG/habitrpg/issues/4726#issuecomment-77643235
2015-03-10 15:40:19 -06:00
812493fec5
feat(tour): Refactor the Justin Guide to be much more streamlined and interactive. Backdrop focuses user on present task. Chapterized guides
2015-03-10 15:40:18 -06:00
9c43a7da22
chore(grunt compile:sprites)
2015-03-09 16:34:55 -05:00
60a62a282e
fix(sprite) Added correctly sized image for iron knight. Closes #4824
2015-03-09 16:33:31 -05:00
9e6c268a97
chore(grunt compile:sprites)
2015-03-09 13:42:35 -05:00
e918aa158d
feat(mystery items) March subscriber sprites added
2015-03-09 13:42:21 -05:00
c23730fdbf
Merge branch 'develop' of github.com:HabitRPG/habitrpg into rebalancing
2015-03-06 07:47:10 -06:00
27446da338
chore(grunt): compile sprites
2015-03-03 21:49:07 -06:00
21fd8061cf
feat(backgrounds): March BGs
2015-03-03 21:42:15 -06:00
f3bd5330a9
Updating to more awesome translation.
2015-03-02 21:52:50 -05:00
5f739fb078
Updating example translation
...
No harm done doing this before pushing it officially through transifex, right?
2015-03-02 21:15:44 -05:00
d9b10a4373
making strings translatable
...
not translating the body keys though...
2015-03-02 21:13:18 -05:00
ec15f239c6
removing extraneous lines
...
Not sure about translations yet...
2015-03-02 21:00:50 -05:00
b484dd3208
Allow for client notifications to user settings
...
Added functionality on successful user changes (see userNotifications
object in userServices.js)
On this commit, it will tell the user "Party order updated" when the
sorting settings change.
2015-03-02 09:00:37 -05:00
85b547196e
chore(i18n): update locales
2015-02-28 18:23:17 +01:00
3d3438e074
chore(grunt): Compile sprites
2015-02-24 20:45:50 -06:00
7d943d9007
fix(mystery): Last missing sprite
2015-02-24 20:40:32 -06:00
f5f21718ae
fix(mystery): Missing sprites
2015-02-24 20:33:02 -06:00
d4f8acd0ef
feat(mystery): February 2015
2015-02-24 20:15:31 -06:00
016e359690
Fixes #4749
2015-02-24 16:58:48 -06:00
6eeff5a0af
Changed matt back to brown hair version
2015-02-24 13:37:14 -06:00
14d6a59e96
chore(i18n): update locales
2015-02-23 21:53:50 +01:00
4151b0733f
add ability to unsubscribe from a single event using a dedicated link
2015-02-23 21:25:01 +01:00
a2eda6c91a
Merge pull request #4733 from remmz0r/gemDisplay
...
Gem Display Text in Modals (new) - Fixes #4645
2015-02-22 13:17:47 -05:00
5aa4015249
Refactored pet display name changes
2015-02-22 12:12:38 -05:00
f355672b3b
Merge pull request #4703 from scribblypanda/issue2825
...
added pet colour to feed/evolve notif
2015-02-22 12:12:23 -05:00
0931d52d56
Edit: fixed tabs instead of spaces issue
2015-02-22 13:39:19 +08:00
44478d3792
Fixes #4645
...
Fixes Gem Display in modals to say [Gem] You have [n] Gems
Modified code to use a translatable string!
Thanks for the tip :)
2015-02-22 13:35:50 +08:00
397a293ca8
change text for recapture emails settings
2015-02-20 18:15:47 +01:00
ba11d827bb
chore(i18n): update locales
2015-02-20 18:04:01 +01:00
c215b90869
Merge pull request #4699 from chimericdream/bulk-add-tasks
...
Bulk add tasks (first version; seeking review & feedback)
2015-02-18 16:41:31 -06:00
0bd912be30
Merge pull request #4690 from chimericdream/task-difficulty-context-classes
...
Add difficulty context class to task list items
2015-02-18 16:37:53 -06:00
37433ee1aa
chore(i18n): update locales
2015-02-18 17:41:31 +01:00
3599eaefaf
Merge branch 'develop' into bulk-add-tasks
2015-02-17 22:32:28 -06:00
789575d6fb
Merge branch 'develop' into task-difficulty-context-classes
2015-02-17 22:31:27 -06:00
87b13d5fc8
chore(grunt): compile sprites
2015-02-17 20:46:40 -06:00
Alice Harris