From c30b993cb919396e1977d397a76b8119c6420fb1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20D=C3=B6rfel?= <christoph.doerfel@gmail.com>
Date: Sat, 29 Aug 2015 23:08:07 +0200
Subject: [PATCH] Add some changes from phaser.comments.d.ts back to
 phaser.d.ts

---
 typescript/phaser.comments.d.ts |  2 +-
 typescript/phaser.d.ts          | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/typescript/phaser.comments.d.ts b/typescript/phaser.comments.d.ts
index 7b814b7f1..64a378af2 100644
--- a/typescript/phaser.comments.d.ts
+++ b/typescript/phaser.comments.d.ts
@@ -1525,7 +1525,7 @@ declare module Phaser {
         * @param region The area to perform the search over. If not given it will replace over the whole BitmapData.
         * @return This BitmapData object for method chaining.
         */
-        replaceRGB(r1: number, g1: number, b1: number, a1: number, r2: number, g2: number, b2: number, a2: number, region: Phaser.Rectangle): Phaser.BitmapData;
+        replaceRGB(r1: number, g1: number, b1: number, a1: number, r2: number, g2: number, b2: number, a2: number, region?: Phaser.Rectangle): Phaser.BitmapData;
 
         /**
         * Resizes the BitmapData. This changes the size of the underlying canvas and refreshes the buffer.
diff --git a/typescript/phaser.d.ts b/typescript/phaser.d.ts
index 08ef7f175..4c1d7ec44 100644
--- a/typescript/phaser.d.ts
+++ b/typescript/phaser.d.ts
@@ -1390,7 +1390,7 @@ declare module Phaser {
         renderTexture(width?: number, height?: number, key?: string, addToCache?: boolean): Phaser.RenderTexture;
         retroFont(font: string, characterWidth: number, characterHeight: number, chars: string, charsPerRow: number, xSpacing?: number, ySpacing?: number, xOffset?: number, yOffset?: number): Phaser.RetroFont;
         rope(x: number, y: number, key: any, frame?: any, points?: Phaser.Point[]): Phaser.Rope;
-        sound(key: string, volume?: number, loop?: number, connect?: boolean): Phaser.Sound;
+        sound(key: string, volume?: number, loop?: boolean, connect?: boolean): Phaser.Sound;
         sprite(x: number, y: number, key?: any, frame?: any, group?: Phaser.Group): Phaser.Sprite;
         spriteBatch(parent: any, name?: string, addToStage?: boolean): Phaser.Group;
         text(x: number, y: number, text: string, style: any, group?: Phaser.Group): Phaser.Text;
@@ -2750,6 +2750,7 @@ declare module Phaser {
                 gravity: Phaser.Point;
                 halfWidth: number;
                 halfHeight: number;
+                height: number;
                 immovable: boolean;
                 mass: number;
                 maxAngular: number;
@@ -4558,9 +4559,10 @@ declare module Phaser {
         tab?: number;
         tabs?: number;
 
+        fontSize?: number;
         fontStyle?: string;
         fontVariant?: string;
-        fontWeight?: string;
+        fontWeight?: string|number;
         backgroundColor?: string;
         boundsAlignH?: string;
         boundsAlignV?: string;
@@ -4595,8 +4597,8 @@ declare module Phaser {
         fontStyle: string;
         fontStyles: string[];
         fontVariant: string;
-        fontWeight: string;
-        fontWeights: string[];
+        fontWeight: string|number;
+        fontWeights: (string|number)[];
         game: Phaser.Game;
         input: Phaser.InputHandler;
         inputEnabled: boolean;
@@ -5178,7 +5180,7 @@ declare module Phaser {
         static parseDimension(size: any, dimension: number): number;
         static pad(str: string, len?: number, pad?: string, dir?: number): string;
         static isPlainObject(object: any): boolean;
-        static extend(deep: boolean, target: any): any;
+        static extend(deep: boolean, target: any, ...args: any[]): any;
         static mixinPrototype(target: any, mixin: any, replace?: boolean): void;
         static mixin<T>(from: T, to: any): T;