Release mergeback v3.86.0 (#8685)

* 3.85.0

* New User Tasks for Mobile (#8682)

* feat(mobile): different default tasks

* fix(linting): missing space

* fix(user): correct client type logic

* test(integration): tasks by platform

* fix(test): remove only

* test(user): deeper checks on tasks

* refactor(test): whitespace for readability

* feat(subs): Jackalope Pets (#8684)

* chore(sprites): compile

* chore(i18n): update locales

* 3.86.0
This commit is contained in:
Sabe Jones
2017-04-18 19:23:24 -05:00
committed by GitHub
parent 4275da0a2e
commit 91ed55cf66
201 changed files with 4199 additions and 3476 deletions
+70
View File
@@ -125,11 +125,13 @@ api.timeTravelStable = {
'Mammoth-Base': t('mammoth'),
'MantisShrimp-Base': t('mantisShrimp'),
'Phoenix-Base': t('phoenix'),
'MagicalBee-Base': t('magicalBee'),
},
mounts: {
'Mammoth-Base': t('mammoth'),
'MantisShrimp-Base': t('mantisShrimp'),
'Phoenix-Base': t('phoenix'),
'MagicalBee-Base': t('magicalBee'),
},
};
@@ -3127,6 +3129,74 @@ api.userDefaults = {
],
};
api.userDefaultsMobile = {
habits: [
{
type: 'habit',
text: t('defaultHabit4Text'),
notes: t('defaultHabit4Notes'),
up: true,
down: false,
attribute: 'per',
}, {
type: 'habit',
text: t('defaultHabit5Text'),
notes: t('defaultHabit5Notes'),
up: false,
down: true,
attribute: 'con',
},
],
dailys: [
{
type: 'daily',
text: t('defaultDaily1Text'),
attribute: 'per',
},
],
todos: [
{
type: 'todo',
text: t('defaultTodo1Text'),
notes: t('defaultTodoNotes'),
completed: false,
attribute: 'int',
},
{
type: 'todo',
text: t('defaultTodo2Text'),
notes: t('defaultTodo2Notes'),
completed: false,
attribute: 'int',
},
],
rewards: [
{
type: 'reward',
text: t('defaultReward2Text'),
notes: t('defaultReward2Notes'),
value: 20,
},
],
tags: [
{
name: t('defaultTag1'),
}, {
name: t('defaultTag2'),
}, {
name: t('defaultTag3'),
}, {
name: t('defaultTag4'),
}, {
name: t('defaultTag5'),
}, {
name: t('defaultTag6'),
}, {
name: t('defaultTag7'),
},
],
};
api.faq = faq;
api.loginIncentives = loginIncentives(api);
+1
View File
@@ -67,6 +67,7 @@ let specialPets = {
'Lion-Veteran': 'veteranLion',
'Gryphon-RoyalPurple': 'royalPurpleGryphon',
'JackOLantern-Ghost': 'ghostJackolantern',
'Jackalope-RoyalPurple': 'royalPurpleJackalope',
};
let specialMounts = {