Merge remote-tracking branch 'upstream/develop' into todos-dated-tab-2014-11-01

Conflicts:
	dist/habitrpg-shared.js

.gitignore

@@ -1,3 +1,4 @@
+coverage.html
 node_modules
 npm-debug.log
 .idea

Gruntfile.js

@@ -23,8 +23,9 @@ module.exports = function(grunt) {
     var sliced = images.slice(i * (images.length/COUNT), (i+1) * images.length/COUNT)
     sprite[''+i] = {
       src: sliced,
-      destImg: 'dist/spritesmith'+i+'.png',
-      destCSS: 'dist/spritesmith'+i+'.css',
+      dest: 'dist/spritesmith'+i+'.png',
+      destCss: 'dist/spritesmith'+i+'.css',
+      engine: 'phantomjssmith',
       algorithm: 'binary-tree',
       padding:1,
       cssTemplate: 'css/css.template.mustache',
@@ -103,4 +104,4 @@ module.exports = function(grunt) {
   grunt.registerTask('default', ['cssmin', 'browserify']);
   grunt.registerTask('full', ['clean', 'sprite', 'cssmin', 'browserify']);
 
-};
+};

README.md

@@ -1,5 +1,6 @@
 [![Build Status](https://travis-ci.org/HabitRPG/habitrpg-shared.png?branch=master)](https://travis-ci.org/HabitRPG/habitrpg-shared)
 
+## We're in the process of migraring this repository to the main HabitRPG repository, you can report any issue [here](https://github.com/HabitRPG/habitrpg).
 Shared resources useful for the multiple HabitRPG repositories, that way all the repositories remain in-sync with common characteristics. Includes things like:
  * Assets - sprites, images, etc
  * CSS - especially, esp. sprite-sheet mapping
@@ -32,4 +33,4 @@ from the website into habitrpg-shared, (2) remove from website & make sure all h
 
 Currently, all or most spritesheets are available. They're in css/*.css, but that's not what you want. You want `/spritesheets.css`
 which is the concat'd file (using `grunt`) which includes all the spritesheets. I'd prefer this be in /dist/spritesheets.css
-for consistency, but it's having image referencing weirdness
+for consistency, but it's having image referencing weirdness

css/backer.css

@@ -57,8 +57,4 @@
   width: 105px;
   height: 72px;
   background: url("../img/sprites/backer-only/BackerOnly-Pet-CerberusPup.gif") no-repeat;
-}
-/*.Pet-Dragon-Hydra {
-  width: 106px;
-  height: 89px;
-}*/
+}

css/index.css

@@ -2,12 +2,12 @@
   margin-left: 1.25em;
 }*/
 
-/* Comment out for holiday events */
-/*.npc_ian {*/
-  /*background: url("../img/sprites/npc_ian.gif") no-repeat;*/
-  /*width: 78px;*/
-  /*height: 135px;*/
-/*}*/
+/* Comment out for holiday events 
+.npc_ian {
+  background: url("../img/sprites/npc_ian.gif") no-repeat;
+  width: 78px;
+  height: 135px;
+} */
 
 .Gems {
   display:inline-block;
@@ -40,3 +40,8 @@
 [class*="Mount_Head_"], [class*="Mount_Body_"]{
   margin-top:18px; /* Sprite accommodates 105x123 box */
 }
+
+.Pet_Currency_Gem {
+  margin-top: 5px;
+  margin-bottom: 5px
+}