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

src/gameobjects/text/static/Text.js

@@ -1022,9 +1022,9 @@ var Text = new Class({
      * @since 3.0.0
      *
      * @param {(number|Phaser.Types.GameObjects.Text.TextPadding)} left - The left padding value, or a padding config object.
-     * @param {number} top - The top padding value.
-     * @param {number} right - The right padding value.
-     * @param {number} bottom - The bottom padding value.
+     * @param {number} [top] - The top padding value.
+     * @param {number} [right] - The right padding value.
+     * @param {number} [bottom] - The bottom padding value.
      *
      * @return {this} This Text object.
      */

src/gameobjects/text/typedefs/TextStyle.js

@@ -7,6 +7,7 @@
  * @property {string} [fontFamily='Courier'] - The font the Text object will render with. This is a Canvas style font string.
  * @property {string} [fontSize='16px'] - The font size, as a CSS size string.
  * @property {string} [fontStyle] - Any addition font styles, such as 'strong'.
+ * @property {string} [font] - The font family or font settings to set. Overrides the other font settings.
  * @property {string} [backgroundColor] - A solid fill color that is rendered behind the Text object. Given as a CSS string color such as `#ff0`.
  * @property {string} [color='#fff'] - The color the Text is drawn in. Given as a CSS string color such as `#fff` or `rgb()`.
  * @property {string} [stroke='#fff'] - The color used to stroke the Text if the `strokeThickness` property is greater than zero.

src/structs/ProcessQueue.js

@@ -202,7 +202,7 @@ var ProcessQueue = new Class({
             {
                 active.splice(idx, 1);
 
-                this.emit(Events.REMOVE, item);
+                this.emit(Events.PROCESS_QUEUE_REMOVE, item);
             }
         }
 
@@ -219,7 +219,7 @@ var ProcessQueue = new Class({
 
             this._active.push(item);
 
-            this.emit(Events.ADD, item);
+            this.emit(Events.PROCESS_QUEUE_ADD, item);
         }
 
         list.length = 0;