Merge branch 'develop' into fixes-issue-5183

common/locales/en/character.json

@@ -70,6 +70,7 @@
     "allocatePerPop": "Add a point to Perception",
     "allocateInt": "Points allocated to Intelligence:",
     "allocateIntPop": "Add a point to Intelligence",
+    "noMoreAllocate": "Now that you've hit level 100, you won't gain any more Attribute Points. You can continue leveling up, or start a new adventure at level 1 by using the <a href='http://habitrpg.wikia.com/wiki/Orb_of_Rebirth' target='_blank'>Orb of Rebirth</a>, available for free in the Market.",
     "stats": "Stats",
     "strength": "Strength",
     "strengthText": "Strength increases the chance of random \"critical hits\" and the Gold, Experience, and drop chance boost from them. It also helps deal damage to boss monsters.",

common/locales/en/spells.json

@@ -1,6 +1,6 @@
 {
   "spellWizardFireballText": "Burst of Flames",
-  "spellWizardFireballNotes": "Flames burst from your hands. You gain XP, and you deal extra damage to Bosses! (Based on: INT)",
+  "spellWizardFireballNotes": "Flames burst from your hands. You gain XP, and you deal extra damage to Bosses! Click on a task to cast. (Based on: INT)",
 
   "spellWizardMPHealText": "Ethereal Surge",
   "spellWizardMPHealNotes": "You sacrifice mana to help your friends. The rest of your party gains MP! (Based on: INT)",
@@ -12,7 +12,7 @@
   "spellWizardFrostNotes": "Ice covers your tasks. None of your streaks will reset to zero tomorrow! (One cast affects all streaks.)",
 
   "spellWarriorSmashText": "Brutal Smash",
-  "spellWarriorSmashNotes": "You hit a task with all of your might. It gets more blue/less red, and you deal extra damage to Bosses! (Based on: STR)",
+  "spellWarriorSmashNotes": "You hit a task with all of your might. It gets more blue/less red, and you deal extra damage to Bosses! Click on a task to cast. (Based on: STR)",
 
   "spellWarriorDefensiveStanceText": "Defensive Stance",
   "spellWarriorDefensiveStanceNotes": "You prepare yourself for the onslaught of your tasks. You gain a buff to Constitution! (Based on: Unbuffed CON)",
@@ -24,10 +24,10 @@
   "spellWarriorIntimidateNotes": "Your gaze strikes fear into your enemies. Your whole party gains a buff to Constitution! (Based on: Unbuffed CON)",
 
   "spellRoguePickPocketText": "Pickpocket",
-  "spellRoguePickPocketNotes": "You rob a nearby task. You gain gold! (Based on: PER)",
+  "spellRoguePickPocketNotes": "You rob a nearby task. You gain gold! Click on a task to cast. (Based on: PER)",
 
   "spellRogueBackStabText": "Backstab",
-  "spellRogueBackStabNotes": "You betray a foolish task. You gain gold and XP! (Based on: STR)",
+  "spellRogueBackStabNotes": "You betray a foolish task. You gain gold and XP! Click on a task to cast. (Based on: STR)",
 
   "spellRogueToolsOfTradeText": "Tools of the Trade",
   "spellRogueToolsOfTradeNotes": "You share your talents with friends. Your whole party gains a buff to Perception! (Based on: Unbuffed PER)",

website/public/js/static.js

@@ -18,6 +18,8 @@ window.habitrpg = angular.module('habitrpg', ['chieffancypants.loadingBar', 'ui.
         });
       })
     }
+
+    $scope.Math = window.Math;
   }])
 
 .controller("PlansCtrl", ['$rootScope',

website/public/manifest.json

@@ -125,7 +125,9 @@
         ],
         "css": [
             "bower_components/css-social-buttons/css/zocial.css",
-            "front/staticstyle.css"
+            "front/staticstyle.css",
+            "common/dist/sprites/habitrpg-shared.css",
+            "app.css"
         ]
     }
 }

website/views/options/profile.jade

@@ -172,9 +172,11 @@ mixin profileStats
           table.table.table-striped
             tr
               td
-                strong.inline
-                  |{{user.stats.points}} 
-                strong.hint(popover-trigger='mouseenter', popover-placement='right', popover=env.t('levelPopover'))=env.t('unallocated')
+                p(ng-if='::user.stats.lvl >= 100')!=env.t('noMoreAllocate')
+                p(ng-if='user.stats.points || user.stats.lvl < 100')
+                  strong.inline
+                    |{{user.stats.points}}&nbsp;
+                  strong.hint(popover-trigger='mouseenter', popover-placement='right', popover=env.t('levelPopover'))=env.t('unallocated')
               td
             tr
               td(colspan=2)

website/views/shared/modals/members.jade

@@ -2,7 +2,7 @@ script(type='text/ng-template', id='modals/member.html')
   .modal-header
     h4
       span {{::profile.profile.name}}
-      span(ng-if='profile.contributor.level')  - {{::contribText(profile.contributor, profile.backer)}}
+      span(ng-if='::contribText && profile.contributor.level')  - {{::contribText(profile.contributor, profile.backer)}}
   .modal-body
     .container-fluid
       .row
@@ -22,6 +22,7 @@ script(type='text/ng-template', id='modals/member.html')
               | 
               | {{::profile.auth.timestamps.loggedin | date:user.preferences.dateFormat}} -
           h3=env.t('stats')
+          // @TODO: Figure out why this isn't showing up in front page
           .label.label-info {{:: {warrior:env.t("warrior"), wizard:env.t("mage"), rogue:env.t("rogue"), healer:env.t("healer")}[profile.stats.class] }}
           include ../profiles/stats
         .col-md-6

website/views/shared/profiles/achievements.jade

@@ -144,7 +144,7 @@ div(ng-if='::profile.achievements.originalUser')
     small!=env.t('originalUserText')
   hr
   
-div(ng-if='::profile.achievements.challenges || user._id == profile._id')
+div(ng-if='::profile.achievements.challenges.length || user._id == profile._id')
   // This is a very strange icon to use. revisit
   .achievement.achievement-karaoke(ng-if='::profile.achievements.challenges.length')
   div(ng-class='::{muted: !profile.achievements.challenges.length}')

website/views/static/front.jade

@@ -35,6 +35,9 @@ html(ng-app='habitrpg', ng-controller='RootCtrl')
 
   body(ng-controller='AuthCtrl')
     include ./login-modal
+    include ../shared/header/avatar
+    include ../shared/mixins
+    include ../shared/modals/members
     .mobile-container
       header#header
         nav.navbar.navbar-default.navbar-static-top
@@ -131,14 +134,14 @@ html(ng-app='habitrpg', ng-controller='RootCtrl')
                       .row
                         .col-sm-8.col-sm-offset-2
                           p
-                          = env.t('andeeliaoQuote') 
+                          = env.t('andeeliaoQuote')
                           small AndeeLiao
                   .item
                     blockquote
                       .row
                         .col-sm-8.col-sm-offset-2
                           p
-                          = env.t('alexandraQuote') 
+                          = env.t('alexandraQuote')
                           small _AlexandraSo_
                 // Carousel Buttons Next/Prev
                 a.left.carousel-control(data-slide='prev', href='#quote-carousel')
@@ -330,7 +333,7 @@ html(ng-app='habitrpg', ng-controller='RootCtrl')
                       .usetweet.tweet.popover.right
                         .arrow
                         .popover-content
-                          = env.t('dreimQuote') 
+                          = env.t('dreimQuote')
               // End Item
               .item.improvement-use
                 h3= env.t('goals')
@@ -368,7 +371,7 @@ html(ng-app='habitrpg', ng-controller='RootCtrl')
                       .usetweet.tweet.popover.right
                         .arrow
                         .popover-content
-                          = env.t('kazuiQuote') 
+                          = env.t('kazuiQuote')
               // End Item
               .item.housework-use
                 h3= env.t('chores')
@@ -642,3 +645,4 @@ html(ng-app='habitrpg', ng-controller='RootCtrl')
       }]).directive('carousel', [function () {
         return {}
       }]);
+