Sabe Jones
|
8074648c70
|
Merge branch 'develop' into tutorial
Conflicts:
common/locales/en/npc.json
|
2015-05-31 15:52:12 -05:00 |
|
Sabe Jones
|
6af7342693
|
feat(tour): Revised intro tutorial
|
2015-05-29 14:03:42 -05:00 |
|
agentx999
|
47134a7094
|
checklist hover text, difficulty hover text
|
2015-05-27 16:02:00 -07:00 |
|
Alys
|
2ac763cc50
|
add message about Resting in the Inn to top of Dailies column when preferences.sleep is true
|
2015-05-13 16:56:52 +10:00 |
|
Kevin Gisi
|
02838214c7
|
Reimplement (broken) task ordering
|
2015-04-13 07:47:56 -04:00 |
|
Alys
|
8af1f0538b
|
revert PR #4996 (Sort dated todos) because of problems sorting other tasks - see comments in #4996
|
2015-04-13 20:16:24 +10:00 |
|
Kevin Gisi
|
ac01d9ad8b
|
Sorted dated todos by date.
|
2015-04-06 03:47:00 -04:00 |
|
kholliday
|
e5cd319ef5
|
Changed empty task messageand added style.
|
2015-03-23 20:18:14 -05:00 |
|
kholliday
|
9a157eea8c
|
Added tooltip for when a task is empty
|
2015-03-23 19:36:37 -05:00 |
|
Bill Parrott
|
4563d22bf0
|
minor updates from code review
|
2015-02-17 14:05:09 -06:00 |
|
Bill Parrott
|
2de3a5dd55
|
first draft of bulk add
|
2015-02-17 00:25:56 -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 |
|