Blade Barringer
|
cbea9f4200
|
chore(i18n): update locales
|
2015-08-29 07:38:54 -05:00 |
|
Sabe Jones
|
9e45017faa
|
Merge branch 'develop' into sabrecat/onboarding-tweaks
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-08-28 13:24:10 -05:00 |
|
Sabe Jones
|
c4012ad762
|
WIP(tutorial): New intro splash
|
2015-08-27 16:04:59 -04:00 |
|
Alys
|
049f9280a2
|
Merge pull request #5798 from Alys/rebirth-keeps-free-gear-2015-08-12
prevent Orb of Rebirth from removing free gear (equipment that has zero gold cost) - partial fix for https://github.com/HabitRPG/habitrpg/issues/5750
|
2015-08-26 22:01:29 +10:00 |
|
Sabe Jones
|
c23312f771
|
feat(mystery): 2015 August items
|
2015-08-24 17:19:12 -04:00 |
|
Alys
|
3d47f3f835
|
remove "as if you had created a new account" from Orb of Rebirth description
|
2015-08-23 17:43:33 +10:00 |
|
lacrimae
|
b8bd87eeb8
|
Wording: Proper English it was not
|
2015-08-20 16:55:05 +02:00 |
|
Sabe Jones
|
190fdd5bb9
|
feat(pets): August cheetah quest
|
2015-08-19 16:55:14 -04:00 |
|
Blade Barringer
|
00ec16877b
|
Merge pull request #5799 from Alys/challenges-editable-by-admins-2015-08-16
allow Challenges to be edited, closed, and deleted by staff and moderators
|
2015-08-18 17:20:19 -05:00 |
|
Garrison Taylor
|
94a31985b7
|
Update information about max levels for buffs.
|
2015-08-17 11:34:30 -05:00 |
|
GihHubSphinx
|
a1f8035515
|
Change 2 strings to exclude html character codes
exclude mldr and rsquo character codes not shown correctly on the front
page
|
2015-08-16 14:17:26 +05:00 |
|
Alys
|
71a9f7caf4
|
make challenge permission error messages translatable
|
2015-08-16 17:30:51 +10:00 |
|
Alys
|
c957fa476e
|
remove text about unlocking Item Shop because it is now available to new players
|
2015-08-16 13:42:53 +10:00 |
|
Alys
|
a94dd0d6a3
|
adjust Orb of Rebirth modal to state that you keep free equipment
|
2015-08-16 13:12:53 +10:00 |
|
Blade Barringer
|
f6dbea008a
|
Merge pull request #5792 from Alys/deleteDefaultDaily
remove unused default tasks
|
2015-08-14 23:23:54 -05:00 |
|
Alys
|
7f0889f405
|
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 |
|
Blade Barringer
|
9e47bc3f4c
|
Merge branch 'GitHubSphinx-Sphinx-i18n-db1' into develop
|
2015-08-14 20:11:37 -05:00 |
|
Blade Barringer
|
f0e3360c35
|
chore(i18n): update locales
|
2015-08-14 17:52:37 -05:00 |
|
Blade Barringer
|
80a6b2dcf9
|
Merge branch 'develop' into card_tweaks
|
2015-08-14 17:29:17 -05:00 |
|
Blade Barringer
|
59d4d9706a
|
Remove quotes from card strings
|
2015-08-14 08:13:25 -05:00 |
|
Sabe Jones
|
ab91a6fba9
|
Merge pull request #5781 from HabitRPG/sabrecat/greeting-cards
Greeting and Thank-You Cards
|
2015-08-13 22:35:25 -05:00 |
|
Blade Barringer
|
610ce048cb
|
Refactor card achievements
|
2015-08-13 22:27:14 -05:00 |
|
Sabe Jones
|
00a212660a
|
feat(greeting-cards): Thank-You & Greets
|
2015-08-13 16:58:31 -05:00 |
|
Sabe Jones
|
f57e3e69a1
|
WIP(greeting-cards): Working send + modals
|
2015-08-13 15:43:51 -05:00 |
|
Sabe Jones
|
b2100c2c54
|
WIP(greeting-cards): Abandon spell refactor
|
2015-08-13 14:31:34 -05:00 |
|
GihHubSphinx
|
dd7ace7eb3
|
Reconstructing pets and mounts progress strings
Second take, keeping the previous view
|
2015-08-13 20:39:23 +05:00 |
|
Alys
|
619b33795a
|
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 |
|
Blade Barringer
|
3f941c3534
|
chore(i18n): update locales
|
2015-08-12 22:37:52 -05:00 |
|
GihHubSphinx
|
c711074809
|
Duplicating 2 strings for better i18n
Duplicating strings "Pets Found" and "Mounts Tamed" used in inventory
and in stats with different order of numbers - words
|
2015-08-12 23:39:11 +05:00 |
|
Sabe Jones
|
3c8424a83e
|
Merge branch 'crookedneighbor/refactor_cards' into sabrecat/greeting-cards
|
2015-08-12 11:53:28 -05:00 |
|
Blade Barringer
|
203a26b6df
|
Refactor how cards are recieved
|
2015-08-12 08:36:57 -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
|
60f92a8997
|
chore(i18n): update locales
|
2015-08-11 20:02:59 -05:00 |
|
Blade Barringer
|
869b27d786
|
Correct markdown
|
2015-08-11 20:01:45 -05:00 |
|
Blade Barringer
|
6861f1460a
|
chore(i18n): update locales
|
2015-08-11 18:50:51 -05:00 |
|
Blade Barringer
|
0dc10b5f8e
|
Convert valentines to markdown
|
2015-08-11 18:47:12 -05:00 |
|
Blade Barringer
|
455dae1032
|
chore(i18n): update locales
|
2015-08-11 08:15:34 -05:00 |
|
Blade Barringer
|
5750da4a13
|
chore(i18n): update locales
|
2015-08-11 08:13:41 -05:00 |
|
Blade Barringer
|
e31138fb76
|
chore(i18n): update locales
|
2015-08-11 07:54:42 -05:00 |
|
Blade Barringer
|
01e2c30795
|
chore(i18n): update locales
|
2015-08-11 07:38:42 -05:00 |
|
Matteo Pagliazzi
|
0a340de9c8
|
chore(i18n): update locales
|
2015-08-11 14:32:00 +02:00 |
|
Blade Barringer
|
2ec7e631e9
|
Update locales
|
2015-08-10 07:52:07 -05:00 |
|
Blade Barringer
|
7aa67e68d8
|
Revert emdash changes
|
2015-08-09 09:19:46 -05:00 |
|
Garrison Taylor
|
df98a28d4c
|
Fix typo
"successully" to "successfully"
|
2015-08-09 10:06:00 -04:00 |
|
Garrison Taylor
|
f2503d0d41
|
Replace a hyphen with an emdash
|
2015-08-09 09:45:04 -04:00 |
|
Garrison Taylor
|
36aef28f72
|
Replace a hyphen with an emdash
|
2015-08-09 09:44:25 -04:00 |
|
Garrison Taylor
|
a261840fb3
|
Rewrite the maximum gems sentence
It is not in plainer English
|
2015-08-09 09:40:38 -04:00 |
|
Garrison Taylor
|
028b5ed825
|
Fix grammar typo
Replace a comma with a semicolon.
|
2015-08-09 09:38:45 -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 |
|
Garrison Taylor
|
f5890131c7
|
Fix grammar typo
Change "but knight shows no signs of stopping" to "but the knight shows no signs of stopping"
|
2015-08-09 09:35:38 -04:00 |
|