krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-16 22:27:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adding new basic audio theme rosstavoTheme (#7766)

Browse Source
This commit is contained in:
Ross Hardy
2016-07-12 03:30:44 +01:00
committed by Alys
parent 694cd8e555
commit 2b30c63448
23 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
common/audio/rosstavoTheme/Achievement_Unlocked.mp3 Normal file
View File

Binary file not shown.

BIN
common/audio/rosstavoTheme/Achievement_Unlocked.ogg Executable file
View File

Binary file not shown.

BIN
common/audio/rosstavoTheme/Chat.mp3 Normal file
View File

Binary file not shown.

BIN
common/audio/rosstavoTheme/Chat.ogg Executable file
View File

Binary file not shown.

BIN
common/audio/rosstavoTheme/Daily.mp3 Normal file
View File

Binary file not shown.

BIN
common/audio/rosstavoTheme/Daily.ogg Executable file
View File

Binary file not shown.

BIN
common/audio/rosstavoTheme/Death.mp3 Normal file
View File

Binary file not shown.

BIN
common/audio/rosstavoTheme/Death.ogg Executable file
View File

Binary file not shown.

BIN
common/audio/rosstavoTheme/Item_Drop.mp3 Normal file
View File

Binary file not shown.

BIN
common/audio/rosstavoTheme/Item_Drop.ogg Executable file
View File

Binary file not shown.

BIN
common/audio/rosstavoTheme/Level_Up.mp3 Normal file
View File

Binary file not shown.

BIN
common/audio/rosstavoTheme/Level_Up.ogg Executable file
View File

Binary file not shown.

BIN
common/audio/rosstavoTheme/Minus_Habit.mp3 Normal file
View File

Binary file not shown.

BIN
common/audio/rosstavoTheme/Minus_Habit.ogg Executable file
View File

Binary file not shown.

BIN
common/audio/rosstavoTheme/Plus_Habit.mp3 Normal file
View File

Binary file not shown.

BIN
common/audio/rosstavoTheme/Plus_Habit.ogg Executable file
View File

Binary file not shown.

BIN
common/audio/rosstavoTheme/Reward.mp3 Normal file
View File

Binary file not shown.

BIN
common/audio/rosstavoTheme/Reward.ogg Executable file
View File

Binary file not shown.

BIN
common/audio/rosstavoTheme/ToDo.mp3 Normal file
View File

Binary file not shown.

BIN
common/audio/rosstavoTheme/ToDo.ogg Executable file
View File

Binary file not shown.

5
common/locales/en/generic.json
View File

@@ -3,7 +3,7 @@
"stringNotFound": "String '<%= string %>' not found.", "stringNotFound": "String '<%= string %>' not found.",
"titleIndex": "Habitica | Your Life The Role Playing Game", "titleIndex": "Habitica | Your Life The Role Playing Game",
"habitica": "Habitica", "habitica": "Habitica",
"titleTasks": "Tasks", "titleTasks": "Tasks",
"titleAvatar": "Avatar", "titleAvatar": "Avatar",
"titleBackgrounds": "Backgrounds", "titleBackgrounds": "Backgrounds",
@@ -24,7 +24,7 @@
"titleTimeTravelers": "Time Travelers", "titleTimeTravelers": "Time Travelers",
"titleSeasonalShop": "Seasonal Shop", "titleSeasonalShop": "Seasonal Shop",
"titleSettings": "Settings", "titleSettings": "Settings",
"expandToolbar": "Expand Toolbar", "expandToolbar": "Expand Toolbar",
"collapseToolbar": "Collapse Toolbar", "collapseToolbar": "Collapse Toolbar",
"markdownBlurb": "Habitica uses markdown for message formatting. See the <a href='http://habitica.wikia.com/wiki/Markdown_Cheat_Sheet' target='_blank'>Markdown Cheat Sheet</a> for more info.", "markdownBlurb": "Habitica uses markdown for message formatting. See the <a href='http://habitica.wikia.com/wiki/Markdown_Cheat_Sheet' target='_blank'>Markdown Cheat Sheet</a> for more info.",
@@ -116,6 +116,7 @@
"audioTheme_wattsTheme": "Watts' Theme", "audioTheme_wattsTheme": "Watts' Theme",
"audioTheme_gokulTheme": "Gokul Theme", "audioTheme_gokulTheme": "Gokul Theme",
"audioTheme_luneFoxTheme": "LuneFox's Theme", "audioTheme_luneFoxTheme": "LuneFox's Theme",
"audioTheme_rosstavoTheme": "Rosstavo's Theme",
"askQuestion": "Ask a Question", "askQuestion": "Ask a Question",
"reportBug": "Report a Bug", "reportBug": "Report a Bug",
"HabiticaWiki": "The Habitica Wiki", "HabiticaWiki": "The Habitica Wiki",

2
website/server/models/user/schema.js
View File

@@ -391,7 +391,7 @@ let schema = new Schema({
skin: {type: String, default: '915533'}, skin: {type: String, default: '915533'},
shirt: {type: String, default: 'blue'}, shirt: {type: String, default: 'blue'},
timezoneOffset: {type: Number, default: 0}, timezoneOffset: {type: Number, default: 0},
sound: {type: String, default: 'off', enum: ['off', 'danielTheBard', 'gokulTheme', 'luneFoxTheme', 'wattsTheme']}, sound: {type: String, default: 'off', enum: ['off', 'danielTheBard', 'gokulTheme', 'luneFoxTheme', 'wattsTheme', 'rosstavoTheme']},
chair: {type: String, default: 'none'}, chair: {type: String, default: 'none'},
timezoneOffsetAtLastCron: Number, timezoneOffsetAtLastCron: Number,
language: String, language: String,

2
website/views/shared/header/menu.jade
View File

@@ -222,7 +222,7 @@ nav.toolbar(ng-controller='MenuCtrl')
div div
ul.toolbar-submenu ul.toolbar-submenu
// Using [{k,v}] instead of {k:v,k:v} to maintain order ('off' at top) // Using [{k,v}] instead of {k:v,k:v} to maintain order ('off' at top)
for theme in ['off', 'danielTheBard', 'gokulTheme', 'luneFoxTheme', 'wattsTheme'] for theme in ['off', 'danielTheBard', 'gokulTheme', 'luneFoxTheme', 'wattsTheme', 'rosstavoTheme']
li li
a(ng-class="{'bg-primary':user.preferences.sound === '# {theme}'}", ng-click="set({'preferences.sound':'#{theme}'})")=env.t('audioTheme_'+theme) a(ng-class="{'bg-primary':user.preferences.sound === '# {theme}'}", ng-click="set({'preferences.sound':'#{theme}'})")=env.t('audioTheme_'+theme)
ul.toolbar-controls ul.toolbar-controls