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

Merge branch 'develop' into carolstone-chron-run-early-issue-4488

Browse Source
This commit is contained in:
Blade Barringer
2015-09-05 09:32:24 -05:00
parent 9fe96b7f94 e0b57fa2c5
commit 9bcaea6fa2
979 changed files with 31917 additions and 22575 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
website/public/js/controllers/settingsCtrl.js
View File

@@ -58,10 +58,6 @@ habitrpg.controller('SettingsCtrl',
Guide.goto('intro', 0, true);
}
$scope.showClassesTour = function(){
Guide.goto('classes', 0, true);
}
$scope.showBailey = function(){
User.set({'flags.newStuff':true});
}
@@ -180,13 +176,11 @@ habitrpg.controller('SettingsCtrl',
$scope.releaseMounts = function() {
User.user.ops.releaseMounts({});
$rootScope.mountCount = 0;
$rootScope.$state.go('tasks');
}
$scope.releaseBoth = function() {
User.user.ops.releaseBoth({});
$rootScope.mountCount = 0;
$rootScope.$state.go('tasks');
}