add new GSalvadi audio theme, created by NomindTR 70d88957-673a-4edd-b97e-f1ecb018dd89 https://trello.com/c/tljx8gKC/18-music-sound-effects-v3 13 June 2015

This commit is contained in:
Alys 2015-06-15 20:33:14 +10:00
parent 090ac94eec
commit b6b2873faf
23 changed files with 3 additions and 2 deletions

Binary file not shown.

Binary file not shown.

BIN
common/audio/gSalvadi/Chat.mp3 Executable file

Binary file not shown.

BIN
common/audio/gSalvadi/Chat.ogg Executable file

Binary file not shown.

BIN
common/audio/gSalvadi/Daily.mp3 Executable file

Binary file not shown.

BIN
common/audio/gSalvadi/Daily.ogg Executable file

Binary file not shown.

BIN
common/audio/gSalvadi/Death.mp3 Executable file

Binary file not shown.

BIN
common/audio/gSalvadi/Death.ogg Executable file

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.

BIN
common/audio/gSalvadi/Reward.mp3 Executable file

Binary file not shown.

BIN
common/audio/gSalvadi/Reward.ogg Executable file

Binary file not shown.

BIN
common/audio/gSalvadi/ToDo.mp3 Executable file

Binary file not shown.

BIN
common/audio/gSalvadi/ToDo.ogg Executable file

Binary file not shown.

View file

@ -85,6 +85,7 @@
"audioTheme_off": "Off",
"audioTheme_danielTheBard": "Daniel The Bard",
"audioTheme_wattsTheme": "Watts' Theme",
"audioTheme_gSalvadi": "GSalvadi",
"askQuestion": "Ask a Question",
"reportBug": "Report a Bug",
"contributeToHRPG": "Contribute to HabitRPG",

View file

@ -310,7 +310,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']},
sound: {type:String, 'default':'off', enum: ['off','danielTheBard', 'wattsTheme', 'gSalvadi']},
language: String,
automaticAllocation: Boolean,
allocationMode: {type:String, enum: ['flat','classbased','taskbased'], 'default': 'flat'},

View file

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