Commit graph

41 commits

Author SHA1 Message Date
AnitaYCheng
2a8eb9f476 Added translation strings for conditional buy-gems modal 2016-01-12 14:58:39 -05:00
Blade Barringer
898850fd6e Adjust wording of market message. 2015-10-30 22:50:04 -05:00
Thrashmandicoot
64ea4e42e7 Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into merchant-button-fix 2015-10-30 03:43:35 -07:00
Thrashmandicoot
ebbc72e9c2 Refactor sellForGold, add displayPotion/item 2015-10-30 02:26:41 -07:00
Sabe Jones
d0a34fc0ad feat(quests): 2015-10 Pet
Also adds Exhaust Strike-specific text to the remaining affected NPCs.
2015-10-20 12:32:45 -04:00
Sabe Jones
380265731f feat(world-boss): Exhaust Ian's text 2015-10-14 21:02:59 -04:00
Thrashmandicoot
a1328bc837 Add bolding to item name 2015-10-07 20:10:27 -07:00
Thrashmandicoot
921cb3ca5d Add displayXForGold keys, refactor sell egg for gold 2015-10-07 19:17:13 -07:00
Sabe Jones
c4012ad762 WIP(tutorial): New intro splash 2015-08-27 16:04:59 -04:00
Blade Barringer
7aa67e68d8 Revert emdash changes 2015-08-09 09:19:46 -05:00
Garrison Taylor
f2503d0d41 Replace a hyphen with an emdash 2015-08-09 09:45:04 -04:00
Garrison Taylor
969d121b80 Fix grammar typo
Change "you get one point to allocate to particular stat" to "you get one point to allocate to a particular stat"
2015-08-09 09:37:16 -04:00
lacrimae
4c88ddc7d1 HabitRPG -> Habitica where missed 2015-07-31 09:37:17 +02:00
Blade Barringer
e28bd5bc57 Update English strings 2015-07-30 21:36:09 -05:00
Sabe Jones
13ab60cafe feat(drops): Enable pets at Level 3 2015-07-28 13:28:45 -05:00
Matteo Pagliazzi
86eaff7cb0 fix(i18n): string for amazon payments 2015-07-17 15:28:55 +02:00
Sabe Jones
6cad2df6a3 test(quests): Add user.ops.buyQuest test
Also adds the Bailey announcement for the day and implements "locked" quest scrolls for the beginning quests in extant quest chains.
2015-07-14 17:34:01 -05:00
Sabe Jones
78d4989544 WIP(event): Summer Splash cont'd
Splits Quests out to a new page. Refactors inventory Jade files and controllers to more manageable structures.
2015-07-08 16:13:23 -05:00
Blade Barringer
03c1476840 Change location of sellFor strings 2015-06-17 19:06:28 -05:00
GihHubSphinx
0cd1ffb794 Fixing button caption for selling Eggs and Potions in the Market 2015-06-16 19:06:53 +05:00
Blade Barringer
42d49a9236 Merge pull request #4734 from ghswa/thuldir/donateText3
Fix a grammatical error in donateText3
2015-06-09 17:44:13 -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
7a8046317d feat(tour): Iteration 5/29 2015-05-29 15:14:19 -05:00
Sabe Jones
6af7342693 feat(tour): Revised intro tutorial 2015-05-29 14:03:42 -05:00
agentx999
5d37eb3c5f tavern and challenge pop-ups, pet and mount pages 2015-05-27 16:09:25 -07:00
Glen Anderson
7e2e628224 Improve wording on subscriber page 2015-05-06 14:05:10 +01:00
Glen Anderson
cb93d2561b Merge remote-tracking branch 'hrpg/develop' into thuldir/donateText3 2015-05-06 14:03:15 +01:00
Blade Barringer
41a6818ea8 Revert inn text 2015-05-03 20:21:53 -05:00
hairlessbear
3c366e9ad3 Changed tavern text to Lemoness's specifications 2015-04-25 13:09:16 -04:00
hairlessbear
b87950d948 Updated tavern text to reflect modified dailies functionality 2015-04-25 12:15:15 -04:00
Tyler Renelle
10ce0a622b fix(tour): updated tour steps copy 2015-03-24 18:07:40 -06:00
Tyler Renelle
1e8265a9f1 feat(tour): add the other tour entries @lemoness 2015-03-19 15:53:12 -06:00
Tyler Renelle
152853a877 feat(tour): update habits step wording @lemoness 2015-03-19 14:28:05 -06:00
Alice Harris
c880c525b4 add missing closing li and ul tag, remove excess b tags to make life easier for translators 2015-03-20 00:27:54 +10:00
Tyler Renelle
9d5889c428 fix(interactive-tour): remove old unused strings 2015-03-16 12:38:22 -06:00
Tyler Renelle
16e996c971 fix(interactive-tour): "Buy the Training Sword" 2015-03-10 15:40:19 -06:00
Tyler Renelle
63a6af6e0a fix(interactive-tour): small updates per
https://github.com/HabitRPG/habitrpg/issues/4726#issuecomment-77643235
2015-03-10 15:40:19 -06:00
Tyler Renelle
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
Glen Anderson
1454fafeb6 Fix a grammatical error in donateText3 2015-02-22 10:10:24 +00: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
Renamed from locales/en/npc.json (Browse further)