Merge branch 'develop' into sabrecat/party-page

common/dist/sprites/spritesmith0.css

@@ -2022,25 +2022,25 @@
 }
 .hair_mustache_1_snowy {
   background-image: url(spritesmith0.png);
-  background-position: -990px -444px;
+  background-position: -1365px -1434px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_mustache_1_snowy {
   background-image: url(spritesmith0.png);
-  background-position: -1015px -459px;
+  background-position: -1390px -1449px;
   width: 60px;
   height: 60px;
 }
 .hair_mustache_1_white {
   background-image: url(spritesmith0.png);
-  background-position: -1456px -1434px;
+  background-position: -990px -444px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_mustache_1_white {
   background-image: url(spritesmith0.png);
-  background-position: -1481px -1449px;
+  background-position: -1015px -459px;
   width: 60px;
   height: 60px;
 }
@@ -4086,479 +4086,491 @@
 }
 .hair_base_10_ghostwhite {
   background-image: url(spritesmith0.png);
-  background-position: -1365px -1434px;
+  background-position: -182px -1889px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_ghostwhite {
   background-image: url(spritesmith0.png);
-  background-position: -1390px -1449px;
+  background-position: -207px -1904px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_green {
   background-image: url(spritesmith0.png);
-  background-position: -1132px -455px;
+  background-position: -1456px -1434px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_green {
   background-image: url(spritesmith0.png);
-  background-position: -1157px -470px;
+  background-position: -1481px -1449px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_halloween {
   background-image: url(spritesmith0.png);
-  background-position: -1132px -364px;
+  background-position: -1132px -455px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_halloween {
   background-image: url(spritesmith0.png);
-  background-position: -1157px -379px;
+  background-position: -1157px -470px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_holly {
   background-image: url(spritesmith0.png);
-  background-position: -1132px -273px;
+  background-position: -1132px -364px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_holly {
   background-image: url(spritesmith0.png);
-  background-position: -1157px -288px;
+  background-position: -1157px -379px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_hollygreen {
   background-image: url(spritesmith0.png);
-  background-position: -1132px -182px;
+  background-position: -1132px -273px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_hollygreen {
   background-image: url(spritesmith0.png);
-  background-position: -1157px -197px;
+  background-position: -1157px -288px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_midnight {
   background-image: url(spritesmith0.png);
-  background-position: -1132px -91px;
+  background-position: -1132px -182px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_midnight {
   background-image: url(spritesmith0.png);
-  background-position: -1157px -106px;
+  background-position: -1157px -197px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_pblue {
   background-image: url(spritesmith0.png);
-  background-position: -1132px 0px;
+  background-position: -1132px -91px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_pblue {
   background-image: url(spritesmith0.png);
-  background-position: -1157px -15px;
+  background-position: -1157px -106px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_pblue2 {
   background-image: url(spritesmith0.png);
-  background-position: -1001px -979px;
+  background-position: -1132px 0px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_pblue2 {
   background-image: url(spritesmith0.png);
-  background-position: -1026px -994px;
+  background-position: -1157px -15px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_peppermint {
   background-image: url(spritesmith0.png);
-  background-position: -910px -979px;
+  background-position: -1001px -979px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_peppermint {
   background-image: url(spritesmith0.png);
-  background-position: -935px -994px;
+  background-position: -1026px -994px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_pgreen {
   background-image: url(spritesmith0.png);
-  background-position: -819px -979px;
+  background-position: -910px -979px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_pgreen {
   background-image: url(spritesmith0.png);
-  background-position: -844px -994px;
+  background-position: -935px -994px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_pgreen2 {
   background-image: url(spritesmith0.png);
-  background-position: -728px -979px;
+  background-position: -819px -979px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_pgreen2 {
   background-image: url(spritesmith0.png);
-  background-position: -753px -994px;
+  background-position: -844px -994px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_porange {
   background-image: url(spritesmith0.png);
-  background-position: -637px -979px;
+  background-position: -728px -979px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_porange {
   background-image: url(spritesmith0.png);
-  background-position: -662px -994px;
+  background-position: -753px -994px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_porange2 {
   background-image: url(spritesmith0.png);
-  background-position: -546px -979px;
+  background-position: -637px -979px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_porange2 {
   background-image: url(spritesmith0.png);
-  background-position: -571px -994px;
+  background-position: -662px -994px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_ppink {
   background-image: url(spritesmith0.png);
-  background-position: -455px -979px;
+  background-position: -546px -979px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_ppink {
   background-image: url(spritesmith0.png);
-  background-position: -480px -994px;
+  background-position: -571px -994px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_ppink2 {
   background-image: url(spritesmith0.png);
-  background-position: -364px -979px;
+  background-position: -455px -979px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_ppink2 {
   background-image: url(spritesmith0.png);
-  background-position: -389px -994px;
+  background-position: -480px -994px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_ppurple {
   background-image: url(spritesmith0.png);
-  background-position: -273px -979px;
+  background-position: -364px -979px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_ppurple {
   background-image: url(spritesmith0.png);
-  background-position: -298px -994px;
+  background-position: -389px -994px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_ppurple2 {
   background-image: url(spritesmith0.png);
-  background-position: -182px -979px;
+  background-position: -273px -979px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_ppurple2 {
   background-image: url(spritesmith0.png);
-  background-position: -207px -994px;
+  background-position: -298px -994px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_pumpkin {
   background-image: url(spritesmith0.png);
-  background-position: -91px -979px;
+  background-position: -182px -979px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_pumpkin {
   background-image: url(spritesmith0.png);
-  background-position: -116px -994px;
+  background-position: -207px -994px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_purple {
   background-image: url(spritesmith0.png);
-  background-position: 0px -979px;
+  background-position: -91px -979px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_purple {
   background-image: url(spritesmith0.png);
-  background-position: -25px -994px;
+  background-position: -116px -994px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_pyellow {
   background-image: url(spritesmith0.png);
-  background-position: -1001px -888px;
+  background-position: 0px -979px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_pyellow {
   background-image: url(spritesmith0.png);
-  background-position: -1026px -903px;
+  background-position: -25px -994px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_pyellow2 {
   background-image: url(spritesmith0.png);
-  background-position: -910px -888px;
+  background-position: -1001px -888px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_pyellow2 {
   background-image: url(spritesmith0.png);
-  background-position: -935px -903px;
+  background-position: -1026px -903px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_rainbow {
   background-image: url(spritesmith0.png);
-  background-position: -819px -888px;
+  background-position: -910px -888px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_rainbow {
   background-image: url(spritesmith0.png);
-  background-position: -844px -903px;
+  background-position: -935px -903px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_red {
   background-image: url(spritesmith0.png);
-  background-position: -728px -888px;
+  background-position: -819px -888px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_red {
   background-image: url(spritesmith0.png);
-  background-position: -753px -903px;
+  background-position: -844px -903px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_snowy {
   background-image: url(spritesmith0.png);
-  background-position: -637px -888px;
+  background-position: -728px -888px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_snowy {
   background-image: url(spritesmith0.png);
-  background-position: -662px -903px;
+  background-position: -753px -903px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_white {
   background-image: url(spritesmith0.png);
-  background-position: -546px -888px;
+  background-position: -637px -888px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_white {
   background-image: url(spritesmith0.png);
-  background-position: -571px -903px;
+  background-position: -662px -903px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_winternight {
   background-image: url(spritesmith0.png);
-  background-position: -455px -888px;
+  background-position: -546px -888px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_winternight {
   background-image: url(spritesmith0.png);
-  background-position: -480px -903px;
+  background-position: -571px -903px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_winterstar {
   background-image: url(spritesmith0.png);
-  background-position: -364px -888px;
+  background-position: -455px -888px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_winterstar {
   background-image: url(spritesmith0.png);
-  background-position: -389px -903px;
+  background-position: -480px -903px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_yellow {
   background-image: url(spritesmith0.png);
-  background-position: -273px -888px;
+  background-position: -364px -888px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_yellow {
   background-image: url(spritesmith0.png);
-  background-position: -298px -903px;
+  background-position: -389px -903px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_zombie {
   background-image: url(spritesmith0.png);
-  background-position: -182px -888px;
+  background-position: -273px -888px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_zombie {
   background-image: url(spritesmith0.png);
-  background-position: -207px -903px;
+  background-position: -298px -903px;
   width: 60px;
   height: 60px;
 }
 .hair_base_11_TRUred {
   background-image: url(spritesmith0.png);
-  background-position: -91px -888px;
+  background-position: -182px -888px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_11_TRUred {
   background-image: url(spritesmith0.png);
-  background-position: -116px -903px;
+  background-position: -207px -903px;
   width: 60px;
   height: 60px;
 }
 .hair_base_11_aurora {
   background-image: url(spritesmith0.png);
-  background-position: 0px -888px;
+  background-position: -91px -888px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_11_aurora {
   background-image: url(spritesmith0.png);
-  background-position: -25px -903px;
+  background-position: -116px -903px;
   width: 60px;
   height: 60px;
 }
 .hair_base_11_black {
   background-image: url(spritesmith0.png);
-  background-position: -990px -717px;
+  background-position: 0px -888px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_11_black {
   background-image: url(spritesmith0.png);
-  background-position: -1015px -732px;
+  background-position: -25px -903px;
   width: 60px;
   height: 60px;
 }
 .hair_base_11_blond {
   background-image: url(spritesmith0.png);
-  background-position: -990px -626px;
+  background-position: -990px -717px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_11_blond {
   background-image: url(spritesmith0.png);
-  background-position: -1015px -641px;
+  background-position: -1015px -732px;
   width: 60px;
   height: 60px;
 }
 .hair_base_11_blue {
   background-image: url(spritesmith0.png);
-  background-position: -990px -535px;
+  background-position: -990px -626px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_11_blue {
   background-image: url(spritesmith0.png);
-  background-position: -1015px -550px;
+  background-position: -1015px -641px;
   width: 60px;
   height: 60px;
 }
 .hair_base_11_brown {
   background-image: url(spritesmith0.png);
-  background-position: 0px -1070px;
+  background-position: -990px -535px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_11_brown {
   background-image: url(spritesmith0.png);
-  background-position: -25px -1085px;
+  background-position: -1015px -550px;
   width: 60px;
   height: 60px;
 }
 .hair_base_11_candycane {
   background-image: url(spritesmith0.png);
-  background-position: -1132px -910px;
+  background-position: 0px -1070px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_11_candycane {
   background-image: url(spritesmith0.png);
-  background-position: -1157px -925px;
+  background-position: -25px -1085px;
   width: 60px;
   height: 60px;
 }
 .hair_base_11_candycorn {
   background-image: url(spritesmith0.png);
-  background-position: -1132px -819px;
+  background-position: -1132px -910px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_11_candycorn {
   background-image: url(spritesmith0.png);
-  background-position: -1157px -834px;
+  background-position: -1157px -925px;
   width: 60px;
   height: 60px;
 }
 .hair_base_11_festive {
   background-image: url(spritesmith0.png);
-  background-position: -1132px -728px;
+  background-position: -1132px -819px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_11_festive {
   background-image: url(spritesmith0.png);
-  background-position: -1157px -743px;
+  background-position: -1157px -834px;
   width: 60px;
   height: 60px;
 }
 .hair_base_11_frost {
   background-image: url(spritesmith0.png);
-  background-position: -1132px -637px;
+  background-position: -1132px -728px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_11_frost {
   background-image: url(spritesmith0.png);
-  background-position: -1157px -652px;
+  background-position: -1157px -743px;
   width: 60px;
   height: 60px;
 }
 .hair_base_11_ghostwhite {
   background-image: url(spritesmith0.png);
-  background-position: -1132px -546px;
+  background-position: -1132px -637px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_11_ghostwhite {
+  background-image: url(spritesmith0.png);
+  background-position: -1157px -652px;
+  width: 60px;
+  height: 60px;
+}
+.hair_base_11_green {
+  background-image: url(spritesmith0.png);
+  background-position: -1132px -546px;
+  width: 90px;
+  height: 90px;
+}
+.customize-option.hair_base_11_green {
   background-image: url(spritesmith0.png);
   background-position: -1157px -561px;
   width: 60px;

common/locales/en/npc.json

@@ -78,11 +78,14 @@
     "tourRewardsBrief": "<strong>Reward List</strong><ul><li>Spend your hard-earned Gold here!</li><li>Purchase Equipment for your avatar, or set custom Rewards.</li></ul>",
     "tourRewardsProceed": "That's all!",
 
-    "welcomeToHabit": "Welcome to Habitica, a game to improve your life!",
-    "welcome1": "Create and customize an in-game avatar to represent you.",
-    "welcome2": "Your real-life tasks affect your avatar's Health (HP), Experience (XP), and Gold!",
-    "welcome3": "Complete tasks to earn Experience (XP) and Gold, which unlock awesome features and rewards!",
+    "welcomeToHabit": "Welcome to Habitica!",
+    "welcome1": "Create a basic avatar.",
+    "welcome1notes": "This avatar will represent you as you progress.",
+    "welcome2": "Set up your tasks.",
+    "welcome2notes": "How well you do on your real-life tasks will control how well you do in the game!",
+    "welcome3": "Progress in life and the game!",
+    "welcome3notes": "As you improve your life, your avatar will level up and unlock pets, quests, equipment, and more!",
     "welcome4": "Avoid bad habits that drain Health (HP), or your avatar will die!",
     "welcome5": "Now you'll customize your avatar and set up your tasks...",
-    "imReady": "I'm Ready!"
+    "imReady": "Enter Habitica"
 }

test/spec/services/notificationServicesSpec.js

@@ -94,7 +94,7 @@ describe('notificationServices', function() {
 
     expect($.pnotify).to.have.been.calledThrice;
     expect(arg.type).to.eql('xp');
-    expect(arg.text).to.eql('+ 50 XP');
+    expect(arg.text).to.eql('+ 50 Experience');
     expect(arg.icon).to.eql('glyphicon glyphicon-star');
   });
 
@@ -104,7 +104,7 @@ describe('notificationServices', function() {
 
     expect($.pnotify).to.have.been.calledOnce;
     expect(arg.type).to.eql('xp');
-    expect(arg.text).to.eql('+ 50.2 XP');
+    expect(arg.text).to.eql('+ 50.2 Experience');
     expect(arg.icon).to.eql('glyphicon glyphicon-star');
   });
 
@@ -134,7 +134,7 @@ describe('notificationServices', function() {
 
     expect($.pnotify).to.have.been.calledOnce;
     expect(arg.type).to.eql('hp');
-    expect(arg.text).to.eql('+ 10 HP');
+    expect(arg.text).to.eql('+ 10 Health');
     expect(arg.icon).to.eql('glyphicon glyphicon-heart');
   });
 
@@ -170,7 +170,7 @@ describe('notificationServices', function() {
 
     expect($.pnotify).to.have.been.calledOnce;
     expect(arg.type).to.eql('mp');
-    expect(arg.text).to.eql('+ 10 MP');
+    expect(arg.text).to.eql('+ 10 Mana');
     expect(arg.icon).to.eql('glyphicon glyphicon-fire');
   });
 

website/public/css/index.styl

@@ -193,4 +193,12 @@ a.label
   text-decoration line-through
 
 .markdown-preview markdown code
-  white-space inherit
+  white-space inherit
+
+// By default everything should render as pixelart, except images from img tags (which tend to be things like gravatars, 
+// screenshots and so on)
+*
+  image-rendering: pixelated
+
+.img-rendering-auto
+  image-rendering: auto

website/public/js/controllers/notificationCtrl.js

@@ -29,7 +29,10 @@ habitrpg.controller('NotificationCtrl',
       if (after == before) return;
       if (User.user.stats.lvl == 0) return;
       var money = after - before;
-      var bonus = User.user._tmp.streakBonus;
+      var bonus;
+      if (User.user._tmp) {
+        bonus = User.user._tmp.streakBonus || 0;
+      }
       Notification.gp(money, bonus || 0);
 
       //Append Bonus

website/public/js/services/guideServices.js

@@ -18,35 +18,45 @@ function($rootScope, User, $timeout, $state, Analytics) {
           placement: "top",
           proceed: window.env.t('tourAvatarProceed'),
           backdrop: false,
-          orphan: true
+          orphan: true,
+          gold: 4,
+          experience: 29
         },
         {
           state: 'tasks',
           element: ".task-column.todos",
           content: window.env.t('tourToDosBrief'),
           placement: "top",
-          proceed: window.env.t('tourOkay')
+          proceed: window.env.t('tourOkay'),
+          gold: 4,
+          experience: 29
         },
         {
           state: 'tasks',
           element: ".task-column.dailys",
           content: window.env.t('tourDailiesBrief'),
           placement: "top",
-          proceed: window.env.t('tourDailiesProceed')
+          proceed: window.env.t('tourDailiesProceed'),
+          gold: 4,
+          experience: 29
         },
         {
           state: 'tasks',
           element: ".task-column.habits",
           content: window.env.t('tourHabitsBrief'),
-          placement: "right",
-          proceed: window.env.t('tourHabitsProceed')
+          placement: "top",
+          proceed: window.env.t('tourHabitsProceed'),
+          gold: 4,
+          experience: 29
         },
         {
           state: 'tasks',
-          element: ".task-column.rewards",
+          element: "h2.task-column_title.reward-title",
           content: window.env.t('tourRewardsBrief'),
-          placement: "top",
+          placement: "left",
           proceed: window.env.t('tourRewardsProceed'),
+          gold: 4,
+          experience: 29,
           final: true
         }
       ]
@@ -179,19 +189,25 @@ function($rootScope, User, $timeout, $state, Analytics) {
       $(step.element).popover('destroy'); // destroy existing hover popovers so we can add our own
       step.onShow = function(){
         Analytics.track({'hitType':'event','eventCategory':'behavior','eventAction':'tutorial','eventLabel':k+'-web','eventValue':i+1,'complete':false});
-        // step.path doesn't work in Angular do to async ui-router. Our custom solution:
         if (step.state && !$state.is(step.state)) {
-          // $state.go() returns a promise, necessary for async tour steps; however, that's not working here - have to use timeout instead :/
           $state.go(step.state);
           return $timeout(function(){});
         }
       };
       step.onHide = function(){
+        var ups={};
+        if (!$rootScope.stepAwarded) $rootScope.stepAwarded = {};
+        if (!$rootScope.stepAwarded[i]) {
+          $rootScope.stepAwarded[i] = true;
+          ups['stats.gp'] = User.user.stats.gp + (step.gold || 0);
+          ups['stats.exp'] = User.user.stats.exp + (step.experience || 0);
+        }
         if (step.final) { // -2 indicates complete
-          var ups={};ups['flags.tour.'+k] = -2;
-          User.set(ups);
+          ups['flags.tour.'+k] = -2;
+          $rootScope.stepAwarded = null;
           Analytics.track({'hitType':'event','eventCategory':'behavior','eventAction':'tutorial','eventLabel':k+'-web','eventValue':i+1,'complete':true})
         }
+        User.set(ups);
       }
     })
   });
@@ -210,7 +226,6 @@ function($rootScope, User, $timeout, $state, Analytics) {
           '<h3 class="popover-title"></h3>' +
           '<div class="popover-content"></div>' +
           '<div class="popover-navigation"> ' +
-            //'<button class="btn btn-sm btn-default" data-role="end" style="float:none;">' + (step.final ? 'Finish Tour' : 'Hide') + '</button>' +
             (showCounter ? '<span style="float:right;">'+ (i+1 +' of '+ _.flatten(chapters[k]).length) +'</span>' : '')+ // counter
             '<div class="btn-group">' +
               (step.hideNavigation ? '' : '<button class="btn btn-sm btn-default" data-role="prev">&laquo; Previous</button>') +
@@ -222,15 +237,12 @@ function($rootScope, User, $timeout, $state, Analytics) {
           '</div>';
       },
       storage: false
-      //onEnd: function(){
-      //  User.set({'flags.showTour': false});
-      //}
     });
   });
 
   var goto = function(chapter, page, force) {
-    //return; // TODO temporarily remove old tutorial system while experimenting with leslie's new gettup
     if (chapter == 'intro') User.set({'flags.welcomed': true});
+    if (page === -1) page = 0;
     var curr = User.user.flags.tour[chapter];
     if (page != curr+1 && !force) return;
     var updates = {};updates['flags.tour.'+chapter] = page;

website/public/js/services/notificationServices.js

@@ -51,7 +51,7 @@ angular.module("habitrpg").factory("Notification",
 
   function exp(val) {
     if (val < -50) return; // don't show when they level up (resetting their exp)
-    _notify(_sign(val) + " " + _round(val) + " " + window.env.t('xp'), 'xp', 'glyphicon glyphicon-star');
+    _notify(_sign(val) + " " + _round(val) + " " + window.env.t('experience'), 'xp', 'glyphicon glyphicon-star');
   }
 
   function error(error){
@@ -64,7 +64,7 @@ angular.module("habitrpg").factory("Notification",
 
   function hp(val) {
     // don't show notifications if user dead
-    _notify(_sign(val) + " " + _round(val) + " " + window.env.t('hp'), 'hp', 'glyphicon glyphicon-heart');
+    _notify(_sign(val) + " " + _round(val) + " " + window.env.t('health'), 'hp', 'glyphicon glyphicon-heart');
   }
 
   function lvl(){
@@ -79,7 +79,7 @@ angular.module("habitrpg").factory("Notification",
   }
 
   function mp(val) {
-    _notify(_sign(val) + " " + _round(val) + " " + window.env.t('mp'), 'mp', 'glyphicon glyphicon-fire');
+    _notify(_sign(val) + " " + _round(val) + " " + window.env.t('mana'), 'mp', 'glyphicon glyphicon-fire');
   }
 
   function streak(val) {

website/views/options/profile.jade

@@ -251,7 +251,7 @@ script(id='partials/options.profile.profile.html', type='text/ng-template')
           |  -
 
         h4=env.t('displayPhoto')
-        img(ng-show='profile.profile.imageUrl', ng-src='{{profile.profile.imageUrl}}')
+        img.image-rendering-auto(ng-show='profile.profile.imageUrl', ng-src='{{profile.profile.imageUrl}}')
         span.muted(ng-hide='profile.profile.imageUrl') - 
           =env.t('none')
           |  -

website/views/options/settings.jade

@@ -191,7 +191,7 @@ script(type='text/ng-template', id='partials/options.settings.api.html')
         h6=env.t('APIToken')
         pre.prettyprint {{user.apiToken}}
         h6=env.t('qrCode')
-        img(src='https://chart.googleapis.com/chart?cht=qr&chs=200x200&chl=%7B%22address%22%3A%22https%3A%2F%2Fhabitrpg.com%22%2C%22user%22%3A%22{{user.id}}%22%2C%22key%22%3A%22{{user.apiToken}}%22%7D&choe=UTF-8&chld=L', alt='qrcode')
+        img.image-rendering-auto(src='https://chart.googleapis.com/chart?cht=qr&chs=200x200&chl=%7B%22address%22%3A%22https%3A%2F%2Fhabitrpg.com%22%2C%22user%22%3A%22{{user.id}}%22%2C%22key%22%3A%22{{user.apiToken}}%22%7D&choe=UTF-8&chld=L', alt='qrcode')
 
         hr
 
@@ -270,7 +270,7 @@ script(id='partials/options.settings.notifications.html', type="text/ng-template
             =env.t('emailNotifications')
           .panel-body
 
-            each notification in ['newPM', 'wonChallenge', 'giftedGems', 'giftedSubscription', 'invitedParty', 'invitedGuild', 'kickedGroup', 'questStarted', 'invitedQuest', 'importantAnnouncements', 'weeklyRecaps'] 
+            each notification in ['newPM', 'wonChallenge', 'giftedGems', 'giftedSubscription', 'invitedParty', 'invitedGuild', 'kickedGroup', 'questStarted', 'invitedQuest', 'importantAnnouncements', 'weeklyRecaps']
               -var preference = 'user.preferences.emailNotifications.' + notification
               -var unsubscribeFromAll = 'user.preferences.emailNotifications.unsubscribeFromAll'
 

website/views/options/social/group.jade

@@ -48,12 +48,16 @@ a.pull-right.gem-wallet(ng-if='group.type!="party"', popover-trigger='mouseenter
             select#group-leader-selection(ng-model='group._newLeader', ng-options='member.profile.name for member in group.members')
 
           div(ng-show='!group._editing')
-            img.pull-right(ng-show='group.logo', ng-src='{{group.logo}}')
+            img.image-rendering-auto.pull-right(ng-show='group.logo', ng-src='{{group.logo}}')
             markdown(text='group.description')
           br
           p=env.t('groupLeader')
             |:
+<<<<<<< HEAD
             a.badge.badge-info(ng-click='clickMember(group.leader._id, true)')
+=======
+            a(class='badge badge-info', ng-click='clickMember(group.leader._id, true)')
+>>>>>>> develop
               | {{group.leader.profile.name}}
 
       .text-center(ng-if='group.type === "party"')

website/views/shared/modals/members.jade

@@ -7,7 +7,7 @@ script(type='text/ng-template', id='modals/member.html')
     .container-fluid
       .row
         .col-md-6
-          img(ng-show='::profile.profile.imageUrl', ng-src='{{::profile.profile.imageUrl}}')
+          img.image-rendering-auto(ng-show='::profile.profile.imageUrl', ng-src='{{::profile.profile.imageUrl}}')
           markdown(ng-show='::profile.profile.blurb', text='::profile.profile.blurb')
           ul.muted.list-unstyled(ng-if='::profile.auth.timestamps')
             li {{profile._id}}

website/views/shared/modals/welcome.jade

@@ -1,18 +1,31 @@
-// Created by sabrecat on 5/18/15.
-
 script(type='text/ng-template', id='modals/welcome.html')
-   .modal-header
-      h4=env.t('welcomeToHabit')
-   .modal-body.text-center
-      h4=env.t('welcome1')
-      .welcome_to_Habit_1.center-block
-      h4=env.t('welcome2')
-      .welcome_to_Habit_2.center-block
-      h4=env.t('welcome3')
-      .welcome_to_Habit_3.center-block
-      h4=env.t('welcome4')
-      .welcome_to_Habit_4.center-block
-   .modal-footer
-      span.h4=env.t('welcome5')
-      | 
-      span.button.btn.btn-primary(ng-click='$close(); Guide.goto("intro",0)')=env.t('imReady')
+  .modal-header.text-center
+    h1=env.t('welcomeToHabit')
+  .modal-body
+    .container-fluid
+      .col-sm-4.col-centered
+        span(style='display:flex')
+          h1
+            | ①
+          h3(style='margin:auto auto auto .5em')=env.t('welcome1')
+        .welcome_basic_avatars(style='margin: 1.5em auto 1.5em')
+        h4=env.t('welcome1notes')
+      .col-sm-4.col-centered
+        span(style='display:flex')
+          h1
+            | ②
+          h3(style='margin:.3em auto auto .5em')=env.t('welcome2')
+        .welcome_sample_tasks(style='margin: 2.5em auto 1.5em')
+        h4=env.t('welcome2notes')
+      .col-sm-4.col-centered
+        span(style='display:flex')
+          h1
+            | ③
+          h3(style='margin:auto auto auto .5em')=env.t('welcome3')
+        .welcome_promo_party(style='margin: 1em auto 1em')
+        h4=env.t('welcome3notes')
+  .modal-footer.text-center(style='margin-top:0')
+    .col-sm-3
+    .col-sm-6
+      a.btn.btn-primary.btn-lg.flex-column(ng-click='$close(); Guide.goto("intro",0)')=env.t('imReady')
+    .col-sm-3

website/views/shared/tasks/index.jade

@@ -11,7 +11,7 @@ script(id='templates/habitrpg-tasks.html', type="text/ng-template")
 
           include ./task_view/graph
 
-          h2.task-column_title {{::list.header}}
+          h2.task-column_title(class='{{::list.type}}-title') {{::list.header}}
 
           include ./task_view/help
 

website/views/static/features.jade

@@ -15,16 +15,16 @@ block content
         .row
           .col-md-6
             a.gallery(href='/marketing/screenshot.png', title=env.t('marketing1Header'))
-              img(src='/marketing/screenshot.png')
+              img.image-rendering-auto(src='/marketing/screenshot.png')
             p.lead=env.t('marketing1Lead1')
           .col-md-6
 
             a.gallery(href='/marketing/gear.png', title=env.t('marketing1Lead2Title'))
-              img(src='/marketing/gear.png')
+              img.image-rendering-auto(src='/marketing/gear.png')
             p.lead!=env.t('marketing1Lead2')
 
             a.gallery(href='/marketing/drops.png', title=env.t('marketing1Lead3Title'))
-              img(src='/marketing/drops.png',style='max-height:200px')
+              img.image-rendering-auto(src='/marketing/drops.png',style='max-height:200px')
             p.lead!=env.t('marketing1Lead3')
 
             // TODO achievements
@@ -35,7 +35,7 @@ block content
         .row
           .col-md-6
             a.gallery(href='/marketing/guild.png', title=env.t('marketing2Header'))
-              img(src='/marketing/guild.png')
+              img.image-rendering-auto(src='/marketing/guild.png')
             p.lead=env.t('marketing2Lead1')
 
             a.gallery(href='/common/img/sprites/spritesmith/quests/quest_vice3.png', title=env.t('marketing2Lead2Title'))
@@ -43,7 +43,7 @@ block content
             p.lead!=env.t('marketing2Lead2')
           .col-md-6
             a.gallery(href='/marketing/challenge.png', title=env.t('challenges'))
-              img(src='/marketing/challenge.png')
+              img.image-rendering-auto(src='/marketing/challenge.png')
             p.lead!=env.t('marketing2Lead3')
 
         hr.clearfix
@@ -52,11 +52,11 @@ block content
         .row
           .col-md-6
             a.gallery(href='/marketing/android_iphone.png', title=env.t('marketing3LeadTitle'))
-              img(src='/marketing/android_iphone.png',style='box-shadow:none;')
+              img.image-rendering-auto(src='/marketing/android_iphone.png',style='box-shadow:none;')
             p.lead!=env.t('marketing3Lead1')
           .col-md-6
             a.gallery(href='/marketing/integration.png', title=env.t('marketing3LeadTitle'))
-              img(src='/marketing/integration.png')
+              img.image-rendering-auto(src='/marketing/integration.png')
             p.lead!=env.t('marketing3Lead2')
 
         hr.clearfix
@@ -74,7 +74,7 @@ block content
         .row
           .col-md-6.col-md-offset-3
             h3=env.t('marketing4Lead3Title')
-            img(src='/marketing/lefnire.png')
+            img.image-rendering-auto(src='/marketing/lefnire.png')
             p.lead
               =env.t('marketing4Lead3-1')
               | 
@@ -112,4 +112,4 @@ block content
             =env.t('landingend3')
             a(href="ENTERPRISEPAGEHERE")=env.t('landingadminlink')
             | 
-            =env.t('landingend4')
+            =env.t('landingend4')

website/views/static/front.jade

@@ -51,7 +51,7 @@ html(ng-app='habitrpg', ng-controller='RootCtrl')
                 span.icon-bar
                 span.icon-bar
               a.navbar-brand(href='#')
-                img(src='https://d2afqr2xdmyzvu.cloudfront.net/assets/habitica_lockup2_desat.png')
+                img.image-rendering-auto(src='https://d2afqr2xdmyzvu.cloudfront.net/assets/habitica_lockup2_desat.png')
             // Collect the nav links, forms, and other content for toggling
             #bs-example-navbar-collapse-1.collapse.navbar-collapse
               ul.nav.navbar-nav.navbar-right
@@ -69,7 +69,7 @@ html(ng-app='habitrpg', ng-controller='RootCtrl')
                   button#header-play-button.btn.btn-primary.navbar-btn.navbar-right(ng-click='playButtonClick()')= env.t('playButtonFull')
       #intro
         h1=env.t('motivate1')
-        img.center-block.img-responsive(src='https://d2afqr2xdmyzvu.cloudfront.net/front/images/intro.png')
+        img.image-rendering-auto.center-block.img-responsive(src='https://d2afqr2xdmyzvu.cloudfront.net/front/images/intro.png')
         // insert intro images
         .introcall.bg-success
           h4= env.t('joinOthers')
@@ -103,13 +103,13 @@ html(ng-app='habitrpg', ng-controller='RootCtrl')
                 // Bottom Carousel Indicators
                 ol.carousel-indicators
                   li.active(data-target='#quote-carousel', data-slide-to='0')
-                    img.img-responsive(src='https://d2afqr2xdmyzvu.cloudfront.net/front/images/testimonials/Drag0nsilver.png', alt='')
+                    img.image-rendering-auto.img-responsive(src='https://d2afqr2xdmyzvu.cloudfront.net/front/images/testimonials/Drag0nsilver.png', alt='')
                   li(data-target='#quote-carousel', data-slide-to='1')
-                    img.img-responsive(src='https://d2afqr2xdmyzvu.cloudfront.net/front/images/testimonials/frabjabulous.png', alt='')
+                    img.image-rendering-auto.img-responsive(src='https://d2afqr2xdmyzvu.cloudfront.net/front/images/testimonials/frabjabulous.png', alt='')
                   li(data-target='#quote-carousel', data-slide-to='2')
-                    img.img-responsive(src='https://d2afqr2xdmyzvu.cloudfront.net/front/images/testimonials/AndeeLiao.png', alt='')
+                    img.image-rendering-auto.img-responsive(src='https://d2afqr2xdmyzvu.cloudfront.net/front/images/testimonials/AndeeLiao.png', alt='')
                   li(data-target='#quote-carousel', data-slide-to='3')
-                    img.img-responsive(src='https://d2afqr2xdmyzvu.cloudfront.net/front/images/testimonials/AlexandraSo.png', alt='')
+                    img.image-rendering-auto.img-responsive(src='https://d2afqr2xdmyzvu.cloudfront.net/front/images/testimonials/AlexandraSo.png', alt='')
                 // Carousel Slides / Quotes
                 .carousel-inner.text-center
                   // Quote 1
@@ -430,7 +430,7 @@ html(ng-app='habitrpg', ng-controller='RootCtrl')
               br
               = env.t('rewardByline2')
             .scrolltweet.hidden-xs.hidden-sm
-              img.scrolltweet-image(data-toggle='tooltip', data-placement='top', title='Elmi', src='https://d2afqr2xdmyzvu.cloudfront.net/front/images/testimonials/Elmi.png')
+              img.image-rendering-auto.scrolltweet-image(data-toggle='tooltip', data-placement='top', title='Elmi', src='https://d2afqr2xdmyzvu.cloudfront.net/front/images/testimonials/Elmi.png')
               .tweet.popover.right.pull-right
                 .arrow
                 .popover-content= env.t('elmiQuote')
@@ -442,10 +442,10 @@ html(ng-app='habitrpg', ng-controller='RootCtrl')
                 span.glyphicon.glyphicon-arrow-down
               img.img-responsive(src='https://d2afqr2xdmyzvu.cloudfront.net/front/images/misc/shop_gold.png')
               img.img-responsive(src='https://d2afqr2xdmyzvu.cloudfront.net/front/images/misc/shop_gold.png')
-              img.img-responsive(src='https://d2afqr2xdmyzvu.cloudfront.net/front/images/misc/shop_gold.png')
+              img.image-rendering-auto.img-responsive(src='https://d2afqr2xdmyzvu.cloudfront.net/front/images/misc/shop_gold.png')
               h2
                 span.glyphicon.glyphicon-arrow-down
-              img.img-responsive(src='https://d2afqr2xdmyzvu.cloudfront.net/front/images/TVreward.png')
+              img.image-rendering-auto.img-responsive(src='https://d2afqr2xdmyzvu.cloudfront.net/front/images/TVreward.png')
           button.btn.btn-primary.btn-lg.fixedcta.gamifybutton(ng-click='playButtonClick()')= env.t('gamifyButton')
       section#levels.container-fluid
         .row
@@ -459,7 +459,7 @@ html(ng-app='habitrpg', ng-controller='RootCtrl')
               br
               = env.t('unlockByline2')
             .scrolltweet.hidden-xs.hidden-sm
-              img.scrolltweet-image(data-toggle='tooltip', data-placement='top', title='16bitFil', src='https://d2afqr2xdmyzvu.cloudfront.net/front/images/testimonials/16bitFil.png')
+              img.image-rendering-auto.scrolltweet-image(data-toggle='tooltip', data-placement='top', title='16bitFil', src='https://d2afqr2xdmyzvu.cloudfront.net/front/images/testimonials/16bitFil.png')
               .tweet.popover.right.pull-right
                 .arrow
                 .popover-content
@@ -558,8 +558,8 @@ html(ng-app='habitrpg', ng-controller='RootCtrl')
                 = env.t('featurePetByline')
           .col-md-4.col-sm-6
             .feature-img.center-block
-              img(src='https://d2afqr2xdmyzvu.cloudfront.net/front/images/achievement-triadbingo.png')
-              img(src='https://d2afqr2xdmyzvu.cloudfront.net/front/images/achievement-perfect.png')
+              img.image-rendering-auto(src='https://d2afqr2xdmyzvu.cloudfront.net/front/images/achievement-triadbingo.png')
+              img.image-rendering-auto(src='https://d2afqr2xdmyzvu.cloudfront.net/front/images/achievement-perfect.png')
             .featuretext
               h4= env.t('featureAchievementHeading')
               p= env.t('featureAchievementByline')
@@ -573,7 +573,7 @@ html(ng-app='habitrpg', ng-controller='RootCtrl')
                 = env.t('featureEquipByline')
           .col-md-4.col-sm-6
             .feature-img
-              img.center-block.img-responsive(src='https://d2afqr2xdmyzvu.cloudfront.net/front/images/Party-Header.png')
+              img.image-rendering-auto.center-block.img-responsive(src='https://d2afqr2xdmyzvu.cloudfront.net/front/images/Party-Header.png')
             .featuretext
               h4= env.t('featureSocialHeading')
               p
@@ -593,19 +593,19 @@ html(ng-app='habitrpg', ng-controller='RootCtrl')
           .row
             .col-lg-2.col-md-2.col-md-offset-1.col-sm-4.col-sm-offset-1.col-xs-6.col-xs-offset-1
               a(href='http://ionicframework.com/')
-                img.img-responsive(src='https://d2afqr2xdmyzvu.cloudfront.net/front/images/presslogos/ionic-logo-horizontal-transparent.png')
+                img.image-rendering-auto.img-responsive(src='https://d2afqr2xdmyzvu.cloudfront.net/front/images/presslogos/ionic-logo-horizontal-transparent.png')
             .col-lg-2.col-lg-offset-0.col-md-2.col-md-offset-0.col-sm-4.col-sm-offset-1.col-xs-6.col-xs-offset-1
               a(href='https://www.jetbrains.com/webstorm/')
-                img.img-responsive(src='https://d2afqr2xdmyzvu.cloudfront.net/front/images/presslogos/logo_webstorm.png')
+                img.image-rendering-auto.img-responsive(src='https://d2afqr2xdmyzvu.cloudfront.net/front/images/presslogos/logo_webstorm.png')
             .col-lg-2.col-lg-offset-0.col-md-2.col-md-offset-0.col-sm-4.col-sm-offset-1.col-xs-6.col-xs-offset-1
               a(href='http://github.com/')
-                img.img-responsive(src='https://d2afqr2xdmyzvu.cloudfront.net/front/images/presslogos/GitHub_Logo.png')
+                img.image-rendering-auto.img-responsive(src='https://d2afqr2xdmyzvu.cloudfront.net/front/images/presslogos/GitHub_Logo.png')
             .col-lg-2.col-lg-offset-0.col-md-2.col-md-offset-0.col-sm-4.col-sm-offset-1.col-xs-6.col-xs-offset-1
               a(href='https://trello.com/')
-                img.img-responsive(src='https://d2afqr2xdmyzvu.cloudfront.net/front/images/presslogos/trello-logo-blue.png')
+                img.image-rendering-auto.img-responsive(src='https://d2afqr2xdmyzvu.cloudfront.net/front/images/presslogos/trello-logo-blue.png')
             .col-lg-2.col-lg-offset-0.col-md-2.col-md-offset-0.col-sm-4.col-sm-offset-1.col-xs-6.col-xs-offset-1
               a(href='https://slack.com/')
-                img.img-responsive(src='https://d2afqr2xdmyzvu.cloudfront.net/front/images/presslogos/landing_slack_hash_wordmark_logo.png')
+                img.image-rendering-auto.img-responsive(src='https://d2afqr2xdmyzvu.cloudfront.net/front/images/presslogos/landing_slack_hash_wordmark_logo.png')
 
         .row.footer-content
           include ../shared/footer

website/views/static/press-kit.jade

@@ -40,4 +40,4 @@ block content
   ul.list-unstyled
     each img in imgs
       li
-        img.press-img(src="/presskit/#{img}.png")
+        img.image-rendering-auto.press-img(src="/presskit/#{img}.png")