Merge pull request #1505 from clark-stevenson/dev

Fixes #1497 and Minor Updates.
This commit is contained in:
Richard Davey 2015-01-02 19:14:25 +00:00
commit 3f8c82405d
2 changed files with 7 additions and 4 deletions

View file

@ -1,6 +1,6 @@
/// <reference path="pixi.d.ts" /> /// <reference path="pixi.d.ts" />
// Type definitions for Phaser dev2.2.0 RC12 2014-12-02 // Type definitions for Phaser dev2.2.0 RC12 2015-02-01
// Project: https://github.com/photonstorm/phaser // Project: https://github.com/photonstorm/phaser
declare class Phaser { declare class Phaser {
@ -802,6 +802,7 @@ declare module Phaser {
onKilled: Phaser.Signal; onKilled: Phaser.Signal;
onRevived: Phaser.Signal; onRevived: Phaser.Signal;
onOutOfBounds: Phaser.Signal; onOutOfBounds: Phaser.Signal;
onEnterBounds: Phaser.Signal;
onInputOver: Phaser.Signal; onInputOver: Phaser.Signal;
onInputOut: Phaser.Signal; onInputOut: Phaser.Signal;
onInputDown: Phaser.Signal; onInputDown: Phaser.Signal;
@ -3798,6 +3799,7 @@ declare module Phaser {
setBackgroundColor(backgroundColor: number): void; setBackgroundColor(backgroundColor: number): void;
setBackgroundColor(backgroundColor: string): void; setBackgroundColor(backgroundColor: string): void;
update(): void; update(): void;
updateTransform(): void;
visibilityChange(event: any): void; visibilityChange(event: any): void;
} }
@ -3822,6 +3824,7 @@ declare module Phaser {
boundingParent: HTMLElement; boundingParent: HTMLElement;
compatibility: { compatibility: {
canExpandParent: boolean; canExpandParent: boolean;
clickTrampoline: string;
forceMinimumDocumentHeight: boolean; forceMinimumDocumentHeight: boolean;
noMargins: boolean; noMargins: boolean;
scrollTo: Point; scrollTo: Point;

View file

@ -1,4 +1,4 @@
// Type definitions for PIXI 2.2.0 dev 2014-11-02 // Type definitions for PIXI 2.2.0 dev 2014-16-12
// Project: https://github.com/GoodBoyDigital/pixi.js/ // Project: https://github.com/GoodBoyDigital/pixi.js/
declare module PIXI { declare module PIXI {
@ -912,7 +912,7 @@ declare module PIXI {
constructor(...points: Point[]); constructor(...points: Point[]);
constructor(...points: number[]); constructor(...points: number[]);
points: number[]; points: any[]; //number[] Point[]
clone(): Polygon; clone(): Polygon;
contains(x: number, y: number): boolean; contains(x: number, y: number): boolean;