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

Author: photonstorm

src/actions/GridAlign.js

@@ -19,7 +19,7 @@ var tempZone = new Zone({ sys: { queueDepthSort: NOOP, events: { once: NOOP } }
  *                                  If both this value and height are set to -1 then this value overrides it and the `height` value is ignored.
  * @property {integer} [height=-1] - The height of the grid in items (not pixels). -1 means lay all items out vertically, regardless of quantity.
  *                                   If both this value and `width` are set to -1 then `width` overrides it and this value is ignored.
- * @property {boolean} [cellWidth=1] - The width of the cell, in pixels, in which the item is positioned.
+ * @property {integer} [cellWidth=1] - The width of the cell, in pixels, in which the item is positioned.
  * @property {integer} [cellHeight=1] - The height of the cell, in pixels, in which the item is positioned.
  * @property {integer} [position=0] - The alignment position. One of the Phaser.Display.Align consts such as `TOP_LEFT` or `RIGHT_CENTER`.
  * @property {number} [x=0] - Optionally place the top-left of the final grid at this coordinate.

src/cameras/2d/Camera.js

@@ -13,6 +13,14 @@ var TransformMatrix = require('../../gameobjects/components/TransformMatrix');
 var ValueToColor = require('../../display/color/ValueToColor');
 var Vector2 = require('../../math/Vector2');
 
+/**
+ * @typedef {object} JSONCameraBounds
+ * @property {number} x - The horizontal position of camera
+ * @property {number} y - The vertical position of camera
+ * @property {number} width - The width size of camera
+ * @property {number} height - The height size of camera
+ */
+
 /**
  * @typedef {object} JSONCamera
  *
@@ -27,11 +35,7 @@ var Vector2 = require('../../math/Vector2');
  * @property {number} scrollX - The horizontal scroll of camera
  * @property {number} scrollY - The vertical scroll of camera
  * @property {string} backgroundColor - The background color of camera
- * @property {object} [bounds] - The bounds of camera
- * @property {number} [bounds.x] - The horizontal position of bounds of camera
- * @property {number} [bounds.y] - The vertical position of bounds of camera
- * @property {number} [bounds.width] - The width of the bounds of camera
- * @property {number} [bounds.height] - The height of the bounds of camera
+ * @property {(JSONCameraBounds|undefined)} [bounds] - The bounds of camera
  */
 
 /**

src/gameobjects/text/static/Text.js

@@ -462,7 +462,11 @@ var Text = new Class({
                 else
                 {
                     spaceLeft -= wordWidthWithSpace;
-                    result += words[j] + ' ';
+                    result += words[j];
+                    if (j < (words.length -1))
+                    {
+                        result += ' ';
+                    }
                 }
             }
 

src/physics/arcade/Factory.js

@@ -65,9 +65,9 @@ var Factory = new Class({
      *
      * @param {Phaser.Physics.Arcade.Body} object1 - The first object to check for collision.
      * @param {Phaser.Physics.Arcade.Body} object2 - The second object to check for collision.
-     * @param {ArcadePhysicsCallback} collideCallback - The callback to invoke when the two objects collide.
-     * @param {ArcadePhysicsCallback} processCallback - The callback to invoke when the two objects collide. Must return a boolean.
-     * @param {*} callbackContext - The scope in which to call the callbacks.
+     * @param {ArcadePhysicsCallback} [collideCallback] - The callback to invoke when the two objects collide.
+     * @param {ArcadePhysicsCallback} [processCallback] - The callback to invoke when the two objects collide. Must return a boolean.
+     * @param {*} [callbackContext] - The scope in which to call the callbacks.
      *
      * @return {Phaser.Physics.Arcade.Collider} The Collider that was created.
      */
@@ -84,9 +84,9 @@ var Factory = new Class({
      *
      * @param {Phaser.Physics.Arcade.Body} object1 - The first object to check for overlap.
      * @param {Phaser.Physics.Arcade.Body} object2 - The second object to check for overlap.
-     * @param {ArcadePhysicsCallback} collideCallback - The callback to invoke when the two objects collide.
-     * @param {ArcadePhysicsCallback} processCallback - The callback to invoke when the two objects collide. Must return a boolean.
-     * @param {*} callbackContext - The scope in which to call the callbacks.
+     * @param {ArcadePhysicsCallback} [collideCallback] - The callback to invoke when the two objects collide.
+     * @param {ArcadePhysicsCallback} [processCallback] - The callback to invoke when the two objects collide. Must return a boolean.
+     * @param {*} [callbackContext] - The scope in which to call the callbacks.
      *
      * @return {Phaser.Physics.Arcade.Collider} The Collider that was created.
      */