sudoxreboot/habitica-self-host
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-self-host.git synced 2026-07-22 05:44:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #5917 from Alys/audio-LuneFox-2015-09-09

Browse source 
new audio theme from LuneFox
This commit is contained in:
Alys 2015-09-12 11:24:12 +10:00
commit 365a58641d
41 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
common/audio/luneFoxTheme/Achievement_Unlocked.mp3 Normal file
View file

Binary file not shown.

BIN
common/audio/luneFoxTheme/Achievement_Unlocked.ogg Normal file
View file

Binary file not shown.

BIN
common/audio/luneFoxTheme/Chat.mp3 Normal file
View file

Binary file not shown.

BIN
common/audio/luneFoxTheme/Chat.ogg Normal file
View file

Binary file not shown.

BIN
common/audio/luneFoxTheme/Daily.mp3 Normal file
View file

Binary file not shown.

BIN
common/audio/luneFoxTheme/Daily.ogg Normal file
View file

Binary file not shown.

BIN
common/audio/luneFoxTheme/Death.mp3 Normal file
View file

Binary file not shown.

BIN
common/audio/luneFoxTheme/Death.ogg Normal file
View file

Binary file not shown.

BIN
common/audio/luneFoxTheme/Item_Drop.mp3 Normal file
View file

Binary file not shown.

BIN
common/audio/luneFoxTheme/Item_Drop.ogg Normal file
View file

Binary file not shown.

BIN
common/audio/luneFoxTheme/Level_Up.mp3 Normal file
View file

Binary file not shown.

BIN
common/audio/luneFoxTheme/Level_Up.ogg Normal file
View file

Binary file not shown.

BIN
common/audio/luneFoxTheme/Minus_Habit.mp3 Normal file
View file

Binary file not shown.

BIN
common/audio/luneFoxTheme/Minus_Habit.ogg Normal file
View file

Binary file not shown.

BIN
common/audio/luneFoxTheme/Plus_Habit.mp3 Normal file
View file

Binary file not shown.

BIN
common/audio/luneFoxTheme/Plus_Habit.ogg Normal file
View file

Binary file not shown.

BIN
common/audio/luneFoxTheme/Reward.mp3 Normal file
View file

Binary file not shown.

BIN
common/audio/luneFoxTheme/Reward.ogg Normal file
View file

Binary file not shown.

BIN
common/audio/luneFoxTheme/ToDo.mp3 Normal file
View file

Binary file not shown.

BIN
common/audio/luneFoxTheme/ToDo.ogg Normal file
View file

Binary file not shown.

0
common/audio/wattsTheme/Achievement_Unlocked.mp3 Executable file → Normal file
View file

0
common/audio/wattsTheme/Achievement_Unlocked.ogg Executable file → Normal file
View file

0
common/audio/wattsTheme/Daily.mp3 Executable file → Normal file
View file

0
common/audio/wattsTheme/Daily.ogg Executable file → Normal file
View file

0
common/audio/wattsTheme/Death.mp3 Executable file → Normal file
View file

0
common/audio/wattsTheme/Death.ogg Executable file → Normal file
View file

0
common/audio/wattsTheme/Item_Drop.mp3 Executable file → Normal file
View file

0
common/audio/wattsTheme/Item_Drop.ogg Executable file → Normal file
View file

0
common/audio/wattsTheme/Level_Up.mp3 Executable file → Normal file
View file

0
common/audio/wattsTheme/Level_Up.ogg Executable file → Normal file
View file

0
common/audio/wattsTheme/Minus_Habit.mp3 Executable file → Normal file
View file

0
common/audio/wattsTheme/Minus_Habit.ogg Executable file → Normal file
View file

0
common/audio/wattsTheme/Plus_Habit.mp3 Executable file → Normal file
View file

0
common/audio/wattsTheme/Plus_Habit.ogg Executable file → Normal file
View file

0
common/audio/wattsTheme/Reward.mp3 Executable file → Normal file
View file

0
common/audio/wattsTheme/Reward.ogg Executable file → Normal file
View file

0
common/audio/wattsTheme/ToDo.mp3 Executable file → Normal file
View file

0
common/audio/wattsTheme/ToDo.ogg Executable file → Normal file
View file

1
common/locales/en/generic.json
View file

@ -91,6 +91,7 @@
"audioTheme_danielTheBard": "Daniel The Bard",
"audioTheme_wattsTheme": "Watts' Theme",
"audioTheme_gokulTheme": "Gokul Theme",
"audioTheme_luneFoxTheme": "LuneFox's Theme",
"askQuestion": "Ask a Question",
"reportBug": "Report a Bug",
"contributeToHRPG": "Contribute to Habitica",

2
website/src/models/user.js
View file

@ -319,7 +319,7 @@ var UserSchema = new Schema({
skin: {type:String, 'default':'915533'},
shirt: {type: String, 'default': 'blue'},
timezoneOffset: Number,
sound: {type:String, 'default':'off', enum: ['off','danielTheBard', 'wattsTheme', 'gokulTheme']},
sound: {type:String, 'default':'off', enum: ['off', 'danielTheBard', 'gokulTheme', 'luneFoxTheme', 'wattsTheme']},
language: String,
automaticAllocation: Boolean,
allocationMode: {type:String, enum: ['flat','classbased','taskbased'], 'default': 'flat'},

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

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