Sabe Jones 41b4d497f7 Merge branch 'develop' into sabrecat/pet-201509 ...

Conflicts:
	common/dist/sprites/habitrpg-shared.css
	common/dist/sprites/spritesmith2.css
	common/dist/sprites/spritesmith2.png
	common/dist/sprites/spritesmith3.css
	common/dist/sprites/spritesmith3.png
	common/dist/sprites/spritesmith4.css
	common/dist/sprites/spritesmith4.png

2015-09-08 13:25:10 -05:00

..

backgrounds.json

feat(content): September content adds

2015-08-31 18:16:54 -04:00

challenge.json

Wording: Proper English it was not

2015-08-20 16:55:05 +02:00

character.json

Update English strings

2015-07-30 21:36:09 -05:00

communityGuidelines.json

HabitRPG -> Habitica where missed

2015-07-31 09:20:20 +02:00

content.json

feat(quests): Horse quest

2015-09-01 13:26:41 -04:00

contrib.json

remove mention of ads from locale strings, delete ads strings that are no longer used - fixes https://github.com/HabitRPG/habitrpg/issues/5765

2015-08-13 16:46:02 +10:00

death.json

feat(warning): Revised low health modal

2015-09-02 16:31:56 -04:00

defaultTasks.json

remove commented-out default task code and unused default task locale strings - fixes https://github.com/HabitRPG/habitrpg/issues/5631#issuecomment-130619901 (comment by GitHubSphinx)

2015-08-15 13:23:42 +10:00

faq.json

fix(FAQ): Remove sample task anchors

2015-09-07 21:58:56 -04:00

front.json

Change 2 strings to exclude html character codes

2015-08-16 14:17:26 +05:00

gear_README.md

Moved folders into common directory

2015-01-21 10:34:04 -06:00

gear.json

feat(content): September content adds

2015-08-31 18:16:54 -04:00

generic.json

Merge branch 'develop' into card_tweaks

2015-08-14 17:29:17 -05:00

groups.json

fix(style): Decap guild/party/chat

2015-09-02 13:50:34 -04:00

limited.json

remove text about unlocking Item Shop because it is now available to new players

2015-08-16 13:42:53 +10:00

messages.json

feat(mystery): July 2015 goodies

2015-07-23 12:05:13 -05:00

npc.json

WIP(tutorial): New intro splash

2015-08-27 16:04:59 -04:00

pets.json

Reconstructing pets and mounts progress strings

2015-08-13 20:39:23 +05:00

quests.json

Add front end button to leave quest

2015-08-23 22:38:55 -05:00

questsContent.json

feat(quests): Horse quest

2015-09-01 13:26:41 -04:00

rebirth.json

remove "as if you had created a new account" from Orb of Rebirth description

2015-08-23 17:43:33 +10:00

settings.json

Tweak wording of custom day start warning

2015-09-06 10:11:28 -05:00

spells.json

feat(event): Summer Splash cont'd

2015-07-01 13:11:53 -05:00

subscriber.json

remove mention of ads from locale strings, delete ads strings that are no longer used - fixes https://github.com/HabitRPG/habitrpg/issues/5765

2015-08-13 16:46:02 +10:00

tasks.json

Update information about max levels for buffs.

2015-08-17 11:34:30 -05:00