sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-07-13 07:18:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into TheHollidayInn-challenges-clone

Browse source
This commit is contained in:
Blade Barringer 2015-06-19 07:41:21 -05:00
commit deff0d4da2
23 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/gokulTheme/Achievement_Unlocked.mp3 Executable file
View file

Binary file not shown.

BIN
common/audio/gokulTheme/Achievement_Unlocked.ogg Executable file
View file

Binary file not shown.

BIN
common/audio/gokulTheme/Chat.mp3 Executable file
View file

Binary file not shown.

BIN
common/audio/gokulTheme/Chat.ogg Executable file
View file

Binary file not shown.

BIN
common/audio/gokulTheme/Daily.mp3 Executable file
View file

Binary file not shown.

BIN
common/audio/gokulTheme/Daily.ogg Executable file
View file

Binary file not shown.

BIN
common/audio/gokulTheme/Death.mp3 Executable file
View file

Binary file not shown.

BIN
common/audio/gokulTheme/Death.ogg Executable file
View file

Binary file not shown.

BIN
common/audio/gokulTheme/Item_Drop.mp3 Executable file
View file

Binary file not shown.

BIN
common/audio/gokulTheme/Item_Drop.ogg Executable file
View file

Binary file not shown.

BIN
common/audio/gokulTheme/Level_Up.mp3 Executable file
View file

Binary file not shown.

BIN
common/audio/gokulTheme/Level_Up.ogg Executable file
View file

Binary file not shown.

BIN
common/audio/gokulTheme/Minus_Habit.mp3 Executable file
View file

Binary file not shown.

BIN
common/audio/gokulTheme/Minus_Habit.ogg Executable file
View file

Binary file not shown.

BIN
common/audio/gokulTheme/Plus_Habit.mp3 Executable file
View file

Binary file not shown.

BIN
common/audio/gokulTheme/Plus_Habit.ogg Executable file
View file

Binary file not shown.

BIN
common/audio/gokulTheme/Reward.mp3 Executable file
View file

Binary file not shown.

BIN
common/audio/gokulTheme/Reward.ogg Executable file
View file

Binary file not shown.

BIN
common/audio/gokulTheme/ToDo.mp3 Executable file
View file

Binary file not shown.

BIN
common/audio/gokulTheme/ToDo.ogg Executable file
View file

Binary file not shown.

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

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

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

@ -311,7 +311,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', 'gokulTheme']},
language: String,
automaticAllocation: Boolean,
allocationMode: {type:String, enum: ['flat','classbased','taskbased'], 'default': 'flat'},

2
website/views/shared/header/menu.jade
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', 'gokulTheme']
li
a(ng-class="{'bg-primary':user.preferences.sound=='#{theme}'}", ng-click="set({'preferences.sound':'#{theme}'})")=env.t('audioTheme_'+theme)