hairlessbear
441d9b2a33
Reverting erroneous language changes
2015-04-25 14:46:35 -04:00
hairlessbear
9fe6b21523
Reverting erroneous language changes
2015-04-25 14:44:46 -04:00
hairlessbear
3f5d5929c5
Reverting erroneous language changes
2015-04-25 14:42:01 -04:00
hairlessbear
3c366e9ad3
Changed tavern text to Lemoness's specifications
2015-04-25 13:09:16 -04:00
hairlessbear
ba1f2b692c
Merge branch 'cron_dailies_fix' of https://github.com/hairlessbear/habitrpg into cron_dailies_fix
2015-04-25 12:19:46 -04:00
hairlessbear
b87950d948
Updated tavern text to reflect modified dailies functionality
2015-04-25 12:15:15 -04:00
hairlessbear
e9e0ff52e4
Update index.coffee
2015-04-24 04:32:47 -04:00
hairlessbear
de8facd58e
Dailies reset without causing damage when resting at Inn
2015-04-24 04:07:51 -04:00
Matteo Pagliazzi
ca3ac96d6d
chore(i18n): update locales
2015-04-23 20:49:53 +02:00
Matteo Pagliazzi
37f7db3c4e
feat(emails): add support for weekly recap emails
2015-04-22 16:30:53 +02:00
Matteo Pagliazzi
c699fcde49
chore(i18n): update locales
2015-04-22 16:22:11 +02:00
Alys
7c36e49243
Merge pull request #5022 from gisikw/dated-tasks-correct-impl
...
Dated tasks correct impl
2015-04-22 16:56:03 +10:00
Matteo Pagliazzi
ee7ba19ed1
feat(i18n): upload japanese, serbian and chinese (taiwan)
2015-04-19 13:34:20 +02:00
Matteo Pagliazzi
662c8cd529
chore(i18n): update locales
2015-04-19 13:28:21 +02:00
Alys
175ec9bb46
Merge pull request #5007 from stillsnowedin/develop
...
Updated the custom day start information in settings. (#5006 )
2015-04-19 15:02:37 +10:00
Sabe Jones
55324e8fa5
chore(grunt): compile sprites
2015-04-15 18:56:51 -05:00
Sabe Jones
7d1a58ca00
fix(slimes): Tweaks and missing sprite
...
Slimes don't have skeletons anyway, right?
2015-04-15 18:48:57 -05:00
Sabe Jones
f13c6cba00
feat(pets): Slime Quest
2015-04-15 18:08:43 -05:00
Matteo Pagliazzi
e474f0300c
chore(i18n): update locales
2015-04-15 17:13:07 +02:00
Blade Barringer
c19ec1387a
chore(grunt): compile sprites
2015-04-14 22:18:37 -05:00
Blade Barringer
fc979dfdaa
create new string for quest participants to correct processing error
...
closes #5025 , closes #5029
2015-04-14 17:52:08 -05:00
Kathryn Norris
8c45ab8dc4
Removed unused strings and altered custom day start text. ( #5006 )
2015-04-14 14:23:20 -07:00
Alys
6296a2f4df
Merge pull request #4969 from Alys/explain-drops-2015-03-04
...
add text to Market for eggs, etc to explain to new users that the items will also drop
2015-04-14 18:22:47 +10:00
Alys
00abf0d694
update Drop System explanation
2015-04-14 17:57:10 +10:00
Kathryn Norris
5dc1d58f8f
Altered custom day start text. ( #5006 )
2015-04-13 17:13:23 -07:00
Kathryn Norris
ea2ad4e4b5
Changed the text for custom day start info. ( #5006 )
2015-04-13 17:13:22 -07:00
Kathryn Norris
ddb7643ff7
Updated the custom day start information in settings. ( #5006 )
2015-04-13 17:13:22 -07:00
Alys
a7abbe0e05
changed drops Learn More link and added drop types to Drops Unlocked message
2015-04-14 08:01:32 +10:00
Matteo Pagliazzi
4fe740a403
chore(i18n): update locales
2015-04-13 19:31:53 +02: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
Matteo Pagliazzi
9b19bd5076
chore(i18n): update locales
2015-04-11 14:53:33 +02:00
Blade Barringer
3fe47957fb
Merge pull request #4989 from TheHollidayInn/fortify-potion-new-art
...
Updated fotify potion art
2015-04-09 17:22:23 -05:00
Blade Barringer
9e118cbfcc
Added gem popover title back in
2015-04-09 17:19:58 -05:00
TheHollidayInn
ab2390e8c9
Updated fotify potion art
2015-04-09 09:15:32 -05:00
Blade Barringer
252e2d0768
Removed gem popover string
2015-04-09 08:09:09 -05:00
Sphinx
7efb594838
Pulling in commits from shared repo
...
Additional changes to other languages are required before merging!
https://trello.com/c/SvTsLdRF/12-translations
"0leg
It would be great if we could have "%number_of% Participants" instead of just "Participants" in the source language so that we could translate it as "участников: %number_of%" which is the only correct way to translate it into Russian without grammatical mistakes. (This example is from Challenges tab.)"
Conflicts:
locales/en/challenge.json
2015-04-09 08:01:34 -05:00
Blade Barringer
cdd0b29924
Merge branch 'develop' into gisikw-sort-dated-todos
2015-04-08 20:47:38 -05:00
Tyler Renelle
fee002b289
feat(analytics): better events organization via category>label>action>value
2015-04-08 17:29:55 -06:00
Blade Barringer
3df45a8cb0
Merge branch 'TheHollidayInn-error-message-rewrite' into develop
2015-04-08 18:11:51 -05:00
Blade Barringer
553bd0d90b
Updated console message
2015-04-08 18:11:34 -05:00
Blade Barringer
a24383c1a2
Removed lingering shared file
2015-04-08 13:58:45 -05:00
Blade Barringer
0f9ce179df
Merge branch 'develop' into Alys-ignore-compiled-js-2015-04-04
...
Conflicts:
common/dist/scripts/habitrpg-shared.js
2015-04-08 13:57:49 -05:00
Matteo Pagliazzi
820909dd9b
chore(i18n): update locales
2015-04-08 19:15:03 +02:00
Matteo Pagliazzi
e58521f416
Merge pull request #4968 from HabitRPG/paglias/emails-unsubscription-page
...
WIP Emails unsubscription page
2015-04-08 19:12:28 +02:00
TheHollidayInn
a317bc2920
Updated seeConsole message to be more helpful to the average user
2015-04-08 08:20:10 -05:00
Kevin Gisi
f12d56e456
Revert "Merge pull request #4995 from HabitRPG/revert-4980-sort-dated-todos"
...
This reverts commit 33f928b6d876ef1fdd92
2015-04-07 22:38:43 -04:00
Blade Barringer
cc674f57cd
Revert "Sorted dated todos by date."
2015-04-07 19:51:27 -05:00
Sabe Jones
76ef1fdd92
Merge pull request #4988 from SabreCat/shiny-seed
...
April backgrounds
2015-04-07 19:12:34 -05:00
Sabe Jones
9d3a14b734
chore(grunt): compile sprites
2015-04-07 19:08:00 -05:00
