Aaron Morris
d9b10a4373
making strings translatable
...
not translating the body keys though...
2015-03-02 21:13:18 -05:00
Aaron Morris
ec15f239c6
removing extraneous lines
...
Not sure about translations yet...
2015-03-02 21:00:50 -05:00
Aaron Morris
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
Sabe Jones
d4f8acd0ef
feat(mystery): February 2015
2015-02-24 20:15:31 -06:00
Blade Barringer
016e359690
Fixes #4749
2015-02-24 16:58:48 -06:00
Blade Barringer
5aa4015249
Refactored pet display name changes
2015-02-22 12:12:38 -05:00
Blade Barringer
f355672b3b
Merge pull request #4703 from scribblypanda/issue2825
...
added pet colour to feed/evolve notif
2015-02-22 12:12:23 -05:00
Bill Parrott
789575d6fb
Merge branch 'develop' into task-difficulty-context-classes
2015-02-17 22:31:27 -06:00
Sabe Jones
0608ac5caa
feat(quest): Pet Rocks
2015-02-17 20:02:06 -06:00
scribblypanda
d46633b089
added pet colour to feed/evolve notif
2015-02-17 12:54:34 -05:00
Bill Parrott
9cf4d9086b
be more explicit about priority value vs context class
2015-02-16 15:49:31 -06:00
Bill Parrott
812599cb77
add difficulty context class to task list items
2015-02-16 15:02:04 -06:00
Blade Barringer
9ddb5e35fb
Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert
...
Conflicts:
common/dist/scripts/habitrpg-shared.js
common/dist/sprites/habitrpg-shared.css
common/img/sprites/spritesmith/customize/hair/hair_base_10_TRUEred.png
common/img/sprites/spritesmith/customize/hair/hair_base_11_TRUEred.png
common/img/sprites/spritesmith/customize/hair/hair_base_12_TRUEred.png
common/img/sprites/spritesmith/customize/hair/hair_base_13_TRUEred.png
common/img/sprites/spritesmith/customize/hair/hair_base_14_TRUEred.png
common/img/sprites/spritesmith/customize/hair/hair_base_9_TRUEred.png
img/sprites/spritesmith/customize/hair/hair_base_10_TRUEred.png
img/sprites/spritesmith/customize/hair/hair_base_10_TRUred.png
img/sprites/spritesmith/customize/hair/hair_base_11_TRUEred.png
img/sprites/spritesmith/customize/hair/hair_base_11_TRUred.png
img/sprites/spritesmith/customize/hair/hair_base_12_TRUEred.png
img/sprites/spritesmith/customize/hair/hair_base_12_TRUred.png
img/sprites/spritesmith/customize/hair/hair_base_13_TRUEred.png
img/sprites/spritesmith/customize/hair/hair_base_13_TRUred.png
img/sprites/spritesmith/customize/hair/hair_base_14_TRUEred.png
img/sprites/spritesmith/customize/hair/hair_base_14_TRUred.png
img/sprites/spritesmith/customize/hair/hair_base_9_TRUEred.png
img/sprites/spritesmith/customize/hair/hair_base_9_TRUred.png
2015-02-12 13:42:11 -06:00
Blade Barringer
45d1fb4c6e
Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert
...
Conflicts:
common/dist/scripts/habitrpg-shared.js
2015-02-09 22:18:22 -06:00
Blade Barringer
28b9ad11cb
Added paths for common scripts
2015-02-04 13:22:41 -06:00
Blade Barringer
5d9cda3b76
Corrected some paths to serve files directly from comon
2015-02-04 12:25:14 -06:00
Blade Barringer
450fdb1486
Merge branch 'common-convert' of github.com:HabitRPG/habitrpg into common-convert
2015-02-03 19:29:54 -06:00
Blade Barringer
47f05f452e
Merge branch 'common-convert' of github.com:HabitRPG/habitrpg into common-convert
2015-02-03 19:26:58 -06:00
Blade Barringer
6f4fbfeaeb
Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert
...
Conflicts:
common/img/sprites/spritesmith/npcs/npc_ian.png
common/img/sprites/spritesmith/npcs/seasonalshop_winter2015.png
dist/habitrpg-shared.css
dist/habitrpg-shared.js
dist/spritesmith1.css
dist/spritesmith1.png
dist/spritesmith2.css
dist/spritesmith2.png
dist/spritesmith3.css
dist/spritesmith3.png
dist/spritesmith4.css
dist/spritesmith4.png
2015-02-03 19:26:14 -06:00
Blade Barringer
14e5f475ab
Moved config back
2015-02-03 16:58:03 -06:00
Blade Barringer
393d614c7f
Moved scirpts back in place
2015-02-03 16:56:50 -06:00
Blade Barringer
f5f1964249
Started organizing common folder
2015-02-01 23:09:07 -06:00
Blade Barringer
88be8f3274
Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert
...
Conflicts:
common/img/sprites/spritesmith/misc/inventory_quest_scroll_penguin.png
common/img/sprites/spritesmith/npcs/npc_bailey_broken.png
common/img/sprites/spritesmith/npcs/npc_justin_broken.png
common/img/sprites/spritesmith/npcs/npc_matt_broken.png
img/sprites/spritesmith/gear/events/birthday/broad_armor_special_birthday2015.png
img/sprites/spritesmith/gear/events/birthday/shop_armor_special_birthday2015.png
img/sprites/spritesmith/misc/inventory_quest_scroll_penguin.png
img/sprites/spritesmith/npcs/npc_bailey_broken.png
img/sprites/spritesmith/npcs/npc_justin_broken.png
img/sprites/spritesmith/quests/inventory_quest_scroll_penguin.png
2015-02-01 14:07:18 -06:00
Blade Barringer
c91b0cd34a
Moved folders into common directory
2015-01-21 10:34:04 -06:00
