add new audi theme from LuneFox, moved themes to alphabetical order, adjusted file permissions for Watts Theme

This commit is contained in:
Alys 2015-09-12 10:55:25 +10:00
parent e86809dc07
commit fbaa5d4321
41 changed files with 3 additions and 2 deletions

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

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

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",

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'},

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