Commit graph

37 commits

Author SHA1 Message Date
Brian Murray
7822e2aaec end sureRest sentence with a period 2016-02-19 19:15:32 -08:00
Luveluen
5315cc9055 Update character.json to separate optOut into two translation strings
optOut is currently used to skip the class selection and to opt out of the messaging system.
that creates translation problems.

Fixes #6511
Closes #6518
2016-01-14 20:40:07 -06:00
Sabe Jones
5d3f41637f Merge branch 'develop' into sabrecat/more-modals 2015-10-30 16:33:17 -04:00
Ricardo Mendes
860abce1d7 Adds auto-equip string to locales/en 2015-10-19 05:20:10 +00:00
Sabe Jones
6505824cb6 feat(modals): Levelup modal
Introduces a new modal that displays whenever the user levels up.
2015-10-13 16:32:07 -04:00
Blade Barringer
e28bd5bc57 Update English strings 2015-07-30 21:36:09 -05:00
Blade Barringer
a139ca8ba5 Merge branch 'develop' into refactor_member_modal_and_stats_page 2015-07-18 17:10:04 -05:00
Blade Barringer
dc2fab14d0 Merge branch 'GitHubSphinx-Sphinx-i18n-db1' into develop 2015-07-18 17:06:26 -05:00
Blade Barringer
ff42505d1b Add string 2015-07-18 16:00:05 -05:00
GihHubSphinx
aa0aec8d4b Revert "New string in stats if gear has no benefits (take 2)"
This reverts commit fdbd18a8ed.
2015-07-16 10:54:17 +05:00
Alys
a946f2b5a5 rename "show more/less" locale keys to be generic; change to those keys for Use Costume text and Custom Day Start text; move Use Costume "show less" link to bottom of section 2015-06-29 21:49:54 +10:00
Alys
11396d4756 make costume option more noticeable and understandable - fixes https://github.com/HabitRPG/habitrpg/issues/5204 2015-06-28 19:40:39 +10:00
GihHubSphinx
fdbd18a8ed New string in stats if gear has no benefits (take 2) 2015-06-28 09:23:49 +05:00
GihHubSphinx
44a120b577 Revert "New string if gear has no benefits"
This reverts commit c2f0f89f2b.
2015-06-28 09:18:39 +05:00
GihHubSphinx
c2f0f89f2b New string if gear has no benefits 2015-06-26 21:49:48 +05:00
GihHubSphinx
3501dbf027 Make gear attributes translatable in stats 2015-06-26 20:49:35 +05:00
Sabe Jones
775f903c3d feat(events): Limited edition
Summer Splash skins and June mystery item. Also announces the Gokul sound theme.
2015-06-25 11:19:01 -05:00
Blade Barringer
d187125c46 Merge branch 'agentx999-text-issues' into develop 2015-06-10 08:13:45 -05:00
Blade Barringer
75fdf84533 move display blurb next to blurb 2015-06-09 17:53:11 -05:00
Blade Barringer
885820c753 Merge branch 'develop' into GitHubSphinx-Sphinx-entry1 2015-06-09 17:49:50 -05:00
Blade Barringer
2a4bbe37c5 Merge pull request #5318 from GitHubSphinx/Sphinx-entry2
Additional translatable line for blurb placeholder (take 2)
2015-06-09 17:39:02 -05:00
agentx999
87462043b6 changed comma to semicolon 2015-06-09 10:57:22 -07:00
Sabe Jones
c90f7e2c34 feat(Armoire): WIP 2015-06-02 17:42:14 -05:00
GihHubSphinx
04d5f2f59e Additional translatable line for blurb placeholder
A new commit to replace https://github.com/HabitRPG/habitrpg/pull/5293
which turned messy after I rebased accidentally

New screenshot: http://i.snag.gy/m9gTA.jpg
2015-05-31 23:41:12 +05:00
GihHubSphinx
2cd3ef7bdb Addressing https://github.com/HabitRPG/habitrpg/issues/5244
Changes:
1. optOutText made more accurate
2. Modal heading in single translatable line with no link to wiki -
which looks nicer
3. Links to wiki articles about classes made translatable
4. New "Learn more" link to wiki article on classes system in the modal
footer
2015-05-31 15:58:27 +05:00
Blade Barringer
46c426856d Correct text 2015-05-17 10:06:40 -05:00
Blade Barringer
da20a493c6 Merge branch 'hairlessbear-level_100_attribute_message' into develop 2015-05-16 22:50:57 -05:00
Blade Barringer
bc967dd850 Adjust wording of attribute points warning 2015-05-16 22:50:24 -05:00
hairlessbear
52d869b195 Fixed issue #5203 2015-05-16 16:52:58 -04:00
Sabe Jones
29109051d7 feat(customize): Animal skins and ears
Implements a base-pet-themed set of avatar skins and head accessories, the latter of which has additional handling for the user to purchase them from the Avatar Customization page.
2015-05-13 11:19:08 -05:00
Sabe Jones
9722af679d feat(customize): Spring Colors 2015-03-28 16:22:52 -05:00
Alice Harris
44259925e4 re-add the dequip option for removing backgrounds with proper bug fix (ref 9199c6c7e2); make whitespace consistent 2015-03-16 19:27:44 +10:00
Alice Harris
9199c6c7e2 remove unequip background feature temporarily - fixes https://github.com/HabitRPG/habitrpg/issues/4857#issuecomment-80722868 2015-03-15 07:44:36 +10:00
kholliday
fc3e1c6c9b Added ability to remove pet, mount, and background. Also, changed text for all dequip buttons. 2015-03-08 15:35:37 -05:00
kholliday
f28bc31a2c Added dequip ability per ticket: 3730 2015-03-04 21:43:17 -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
c91b0cd34a Moved folders into common directory 2015-01-21 10:34:04 -06:00
Renamed from locales/en/character.json (Browse further)