Merged in develop

This commit is contained in:
Keith Holliday
2017-06-27 22:23:13 -06:00
897 changed files with 50434 additions and 41464 deletions

View File

@@ -210,6 +210,10 @@ habitrpg.controller('NotificationCtrl',
$rootScope.playSound('Achievement_Unlocked');
Achievement.displayAchievement('joinedGuild', {size: 'md'});
break;
case 'CHALLENGE_JOINED_ACHIEVEMENT':
$rootScope.playSound('Achievement_Unlocked');
Achievement.displayAchievement('joinedChallenge', {size: 'md'});
break;
case 'NEW_CONTRIBUTOR_LEVEL':
$rootScope.playSound('Achievement_Unlocked');
Achievement.displayAchievement('contributor', {size: 'md'});