Commit Graph

35 Commits

Author SHA1 Message Date
Garrison Taylor 94a31985b7 Update information about max levels for buffs. 2015-08-17 11:34:30 -05:00
Alys 665c32ee54 change Fortify Potion description for blue tasks making the game too easy - fixes https://github.com/HabitRPG/habitrpg/issues/5758 2015-08-12 11:25:08 +10:00
Blade Barringer 787cb6cabb Final adjustments to PR
- Rename strings to make them easier to expand upon in the future
- adjust line break formatting
- remove terniary operator
2015-08-05 18:27:24 -05:00
Simon Gabler 2343e4720c Add tooltips for day buttons to show "due" or "not due" 2015-08-05 22:25:03 +02:00
Simon Gabler 1997338751 Show popover for daily and weekly dailies 2015-08-05 22:23:41 +02:00
Simon Gabler 99bdf4c541 Add hint for "Repeat every" option title. Fixes #5603 2015-08-05 17:02:02 +02:00
Blade Barringer e28bd5bc57 Update English strings 2015-07-30 21:36:09 -05:00
Alys 122920975d add Trivial difficulty/priority setting to task Advanced Options (also remove whitespace at ends of lines) 2015-06-28 14:41:02 +10:00
Blade Barringer 831f5b89bd Merge branch 'develop' into nthomsn-develop 2015-06-14 01:27:35 -05:00
GihHubSphinx fc5cb5d228 Still addressing #5202
The last thing left as it seems is Click for help toolbar
2015-06-12 17:42:40 +05:00
Blade Barringer 54681e36b5 Merge branch 'develop' into blade-Finish_weeklies_pr 2015-06-11 19:47:46 -05:00
Nicholas Thomson 867308975f Merge https://github.com/HabitRPG/habitrpg into develop 2015-06-11 08:40:36 -07:00
hairlessbear b1b8dc18af Made links translatable 2015-06-07 13:17:57 -04:00
Blade Barringer c8ed73f685 Added help text for startDate 2015-06-07 00:06:31 -05:00
hairlessbear d415e9b014 Slightly modified habitHelp3 2015-06-05 09:35:01 -04:00
hairlessbear d26e4780fd Added links to multiple task help phrases 2015-06-05 09:26:33 -04:00
Blade Barringer 076f7f0db9 Create translatable strings for dailies 2015-06-03 21:48:38 -05:00
Blade Barringer 7adde1d1dd Merge branch 'develop' into blade-Finish_weeklies_pr 2015-06-03 07:41:09 -05:00
Blade Barringer af94236a01 Add wiki link to reward help string.
Fixes #5333
2015-06-02 08:15:16 -05:00
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
Allen Pan a763a3a3da Cleaned up task.jade file:
- moved ugly html newlines into the stylesheet
- renamed temporary var for datePicker’s ngmodel from _dateString to _tempDateForPicker
- renamed open -> openDatePicker, and have the function track datePicker’s open/closed state on a per task instead of global basis
2015-05-15 20:24:47 -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
Nicholas Thomson 39712ca60e Removed unnecessary string 2015-03-08 22:49:10 -04:00
Nicholas Thomson 075b3e5b4e Denser task edit style 2015-03-08 15:14:21 -04: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