Merge branch 'master' of https://github.com/photonstorm/phaser

Author: photonstorm

src/input/keyboard/KeyboardManager.js

@@ -362,13 +362,13 @@ var KeyboardManager = new Class({
             var event = queue[i];
             var code = event.keyCode;
 
-            //  Will emit a keyboard or keyup event
-            this.emit(event.type, event);
-
             if (event.type === 'keydown')
             {
-                if (KeyMap[code])
+                if (KeyMap[code] && (keys[code] === undefined || keys[code].isDown === false))
                 {
+                    //  Will emit a keyboard or keyup event
+                    this.emit(event.type, event);
+
                     this.emit('keydown_' + KeyMap[code], event);
                 }
 
@@ -379,6 +379,9 @@ var KeyboardManager = new Class({
             }
             else
             {
+                //  Will emit a keyboard or keyup event
+                this.emit(event.type, event);
+
                 this.emit('keyup_' + KeyMap[code], event);
 
                 if (keys[code])

src/input/keyboard/keys/ProcessKeyDown.js

@@ -34,10 +34,14 @@ var ProcessKeyDown = function (key, event)
     key.shiftKey = event.shiftKey;
     key.location = event.location;
 
-    key.isDown = true;
-    key.isUp = false;
-    key.timeDown = event.timeStamp;
-    key.duration = 0;
+    if (key.isDown === false)
+    {
+        key.isDown = true;
+        key.isUp = false;
+        key.timeDown = event.timeStamp;
+        key.duration = 0;
+    }
+
     key.repeats++;
 
     key._justDown = true;

src/loader/LoaderPlugin.js

@@ -656,7 +656,7 @@ var LoaderPlugin = new Class({
                 //  Yup, add them to the Texture Manager
 
                 //  Is the data JSON Hash or JSON Array?
-                if (Array.isArray(data[0].frames))
+                if (Array.isArray(data[0].textures) || Array.isArray(data[0].frames))
                 {
                     textures.addAtlasJSONArray(key, images, data);
                 }

src/math/random-data-generator/RandomDataGenerator.js

@@ -85,7 +85,7 @@ var RandomDataGenerator = new Class({
          * @type {array}
          * @since 3.0.0
          */
-        this.sign = [ -1, 1 ];
+        this.signs = [ -1, 1 ];
 
         if (seeds)
         {
@@ -171,7 +171,7 @@ var RandomDataGenerator = new Class({
 
     /**
      * Reset the seed of the random data generator.
-     * 
+     *
      * _Note_: the seed array is only processed up to the first `undefined` (or `null`) value, should such be present.
      *
      * @method Phaser.Math.RandomDataGenerator#sow
@@ -356,7 +356,7 @@ var RandomDataGenerator = new Class({
      */
     sign: function ()
     {
-        return this.pick(this.sign);
+        return this.pick(this.signs);
     },
 
     /**

src/physics/arcade/World.js

@@ -1364,10 +1364,11 @@ var World = new Class({
      */
     collideHandler: function (object1, object2, collideCallback, processCallback, callbackContext, overlapOnly)
     {
+        //  Collide Group with Self
         //  Only collide valid objects
         if (object2 === undefined && object1.isParent)
         {
-            return this.collideGroupVsSelf(object1, collideCallback, processCallback, callbackContext, overlapOnly);
+            return this.collideGroupVsGroup(object1, object1, collideCallback, processCallback, callbackContext, overlapOnly);
         }
 
         //  If neither of the objects are set then bail out

src/textures/TextureManager.js

@@ -314,9 +314,11 @@ var TextureManager = new Class({
 
         if (Array.isArray(data))
         {
-            for (var i = 0; i < data.length; i++)
+            var singleAtlasFile = (data.length === 1); // multi-pack with one atlas file for all images
+            for (var i = 0; i < texture.source.length; i++)
             {
-                Parser.JSONArray(texture, i, data[i]);
+                var atlasData = singleAtlasFile ? data[0] : data[i];
+                Parser.JSONArray(texture, i, atlasData);
             }
         }
         else

src/textures/parsers/JSONArray.js

@@ -34,7 +34,7 @@ var JSONArray = function (texture, sourceIndex, json)
     texture.add('__BASE', sourceIndex, 0, 0, source.width, source.height);
 
     //  By this stage frames is a fully parsed array
-    var frames = (Array.isArray(json.textures)) ? json.textures[0].frames : json.frames;
+    var frames = (Array.isArray(json.textures)) ? json.textures[sourceIndex].frames : json.frames;
 
     var newFrame;