Skip to content

Commit 52a2c26

Browse files
vforshvforsh
committed
Revert "Add missing semicolons. Now working with WebStorm 8."
This reverts commit 01b7a59.
1 parent 01b7a59 commit 52a2c26

1 file changed

Lines changed: 63 additions & 16 deletions

File tree

‎build/phaser.d.ts‎

Lines changed: 63 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -469,6 +469,7 @@ declare module PIXI {
469469
drawRect(x: number, y: number, width: number, height: number): void;
470470
endFill(): void;
471471
generateTexture(): Texture;
472+
generateTexture(renderer: PIXI.IPixiRenderer): RenderTexture;
472473
getBounds(): Rectangle;
473474
lineStyle(lineWidth: number, color: number, alpha: number): void;
474475
lineTo(x: number, y: number): void;
@@ -1129,7 +1130,7 @@ declare module Phaser {
11291130
width: number;
11301131

11311132
add(object: any): void;
1132-
alphaMask(source: any, mask: any): void;
1133+
alphaMask(source: any, mask: any): void
11331134
clear(): void;
11341135
copyPixels(source: any, area: Phaser.Rectangle, destX: number, destY: number): void;
11351136
draw(source: any, destX: number, destY: number): void;
@@ -1254,7 +1255,7 @@ declare module Phaser {
12541255
getFrameByName(key: string, frame: string): Phaser.Frame;
12551256
getFrameData(key: string): Phaser.FrameData;
12561257
getImage(key: string): Object;
1257-
getJSON(key:string): Object;
1258+
getJSON(key:string): Object
12581259
getKeys(array: string[]): string[];
12591260
getPhysicsData(key: string, object?: string, fixtureKey?: string): Object;
12601261
getSound(key: string): Phaser.Sound;
@@ -1418,6 +1419,7 @@ declare module Phaser {
14181419
chrome: boolean;
14191420
chromeOS: boolean;
14201421
cocoonJS: boolean;
1422+
crosswalk: boolean;
14211423
css3D: boolean;
14221424
desktop: boolean;
14231425
ejecta: boolean;
@@ -1658,7 +1660,7 @@ declare module Phaser {
16581660
checkFrameName(name: string): boolean;
16591661
getFrame(index: number): Phaser.Frame;
16601662
getFrameByName(name: string): Phaser.Frame;
1661-
getFrameIndexes(frames: number[], useNumericIndex?: boolean, output?: number[]): number[];
1663+
getFrameIndexes(frames: number[], useNumericIndex?: boolean, output?: number[]): number[]
16621664
getFrameRange(start: number, end: number, output: Phaser.Frame[]): Phaser.Frame[];
16631665
getFrames(frames: number[], useNumericIndex?: boolean, output?: Phaser.Frame[]): Phaser.Frame[];
16641666

@@ -1780,7 +1782,7 @@ declare module Phaser {
17801782
sprite(x: number, y: number, key?: any, frame?: any, group?: Phaser.Group): Phaser.Sprite;
17811783
spriteBatch(parent: any, name?: string, addToStage?: boolean): Phaser.Group;
17821784
text(x: number, y: number, text: string, style: any, group?: Phaser.Group): Phaser.Text;
1783-
tilemap(key: string, tileWidth?: number, tileHeight?: number, width?: number, height?: number): Phaser.Tilemap;
1785+
tilemap(key?: string, tileWidth?: number, tileHeight?: number, width?: number, height?: number): Phaser.Tilemap;
17841786
tileSprite(x: number, y: number, width: number, height: number, key?: any, frame?: any, group?: Phaser.Group): Phaser.TileSprite;
17851787
tween(obj: Object): Phaser.Tween;
17861788

@@ -1930,7 +1932,6 @@ declare module Phaser {
19301932

19311933
angle: number;
19321934
alive: boolean;
1933-
cacheAsBitmap: boolean;
19341935
cameraOffset: Phaser.Point;
19351936
cursor: any;
19361937
enableBody: boolean;
@@ -1958,7 +1959,8 @@ declare module Phaser {
19581959
countLiving(): number;
19591960
create(x: number, y: number, key: string, frame?: any, exists?: boolean): Phaser.Sprite;
19601961
createMultiple(quantity: number, key: string, frame?: any, exists?: boolean): Phaser.Sprite;
1961-
destroy(destroyChildren?: boolean, soft?:boolean): void;
1962+
customSort(sortHandler: Function, context: Object): void;
1963+
destroy(destroyChildren?: boolean, soft?: boolean): void;
19621964
divideAll(property: string, amount: number, checkAlive?: boolean, checkVisible?: boolean): void;
19631965
forEach(callback: Function, callbackContext: Object, checkExists?: boolean): void;
19641966
forEachAlive(callback: Function, callbackContext: Object): void;
@@ -1980,9 +1982,9 @@ declare module Phaser {
19801982
postUpdate(): void;
19811983
preUpdate(): void;
19821984
previous(): void;
1983-
remove(child: any): boolean;
1984-
removeAll(): void;
1985-
removeBetween(startIndex: number, endIndex: number): void;
1985+
remove(child: any, destroy?: boolean): boolean;
1986+
removeAll(destroy?: boolean): void;
1987+
removeBetween(startIndex: number, endIndex?: number, destroy?: boolean): void;
19861988
replace(oldChild: any, newChild: any): any;
19871989
reverse(): void;
19881990
sendToBack(child: any): any;
@@ -2090,6 +2092,7 @@ declare module Phaser {
20902092
recordLimit: number;
20912093
recordPointerHistory: boolean;
20922094
recordRate: number;
2095+
resetLocked: boolean;
20932096
scale: Phaser.Point;
20942097
speed: Phaser.Point;
20952098
tapRate: number;
@@ -2187,7 +2190,7 @@ declare module Phaser {
21872190

21882191
class Key {
21892192

2190-
constructor(game: Phaser.Game, keycode: number);
2193+
constructor(game: Phaser.Game, keycode: number)
21912194

21922195
altKey: boolean;
21932196
ctrlKey: boolean;
@@ -2210,7 +2213,7 @@ declare module Phaser {
22102213
justReleased(duration?: number): boolean;
22112214
processKeyDown(event: KeyboardEvent): void;
22122215
processKeyUp(event: KeyboardEvent): void;
2213-
reset(): void;
2216+
reset(hard?: boolean): void;
22142217
update(): void;
22152218

22162219
}
@@ -2338,7 +2341,7 @@ declare module Phaser {
23382341
processKeyUp(event: KeyboardEvent): void;
23392342
removeKey(keycode: number): void;
23402343
removeKeyCapture(keycode: number): void;
2341-
reset(): void;
2344+
reset(hard?: boolean): void;
23422345
start(): void;
23432346
stop(): void;
23442347
update(): void;
@@ -2412,6 +2415,7 @@ declare module Phaser {
24122415
game: Phaser.Game;
24132416
hasLoaded: boolean;
24142417
isLoading: boolean;
2418+
onFileStart: Phaser.Signal;
24152419
onFileComplete: Phaser.Signal;
24162420
onFileError: Phaser.Signal;
24172421
onLoadComplete: Phaser.Signal;
@@ -2536,7 +2540,7 @@ declare module Phaser {
25362540

25372541
class Mouse {
25382542

2539-
constructor(game: Phaser.Game);
2543+
constructor(game: Phaser.Game)
25402544

25412545
static LEFT_BUTTON: number;
25422546
static MIDDLE_BUTTON: number;
@@ -2599,6 +2603,18 @@ declare module Phaser {
25992603

26002604
}
26012605

2606+
class Particle extends Phaser.Sprite {
2607+
2608+
constructor(game: Phaser.Game, x: number, y: number, key?: any, frame?: any);
2609+
2610+
onEmit(): void;
2611+
reset(x: number, y: number, health?: number): Phaser.Particle;
2612+
setAlphaData(data: any[]): void;
2613+
setScaleData(data: any[]): void;
2614+
update(): void;
2615+
2616+
}
2617+
26022618
class Particles {
26032619

26042620
constructor(game: Phaser.Game);
@@ -2620,7 +2636,10 @@ declare module Phaser {
26202636
class Emitter extends Phaser.Group {
26212637

26222638
constructor(game: Phaser.Game, x?: number, y?: number, maxParticles?: number);
2623-
2639+
2640+
alphaData: any[];
2641+
autoAlpha: boolean;
2642+
autoScale: boolean;
26242643
angle: number;
26252644
angularDrag: number;
26262645
bottom: number;
@@ -2634,7 +2653,7 @@ declare module Phaser {
26342653
height: number;
26352654
left: number;
26362655
lifespan: number;
2637-
maxParticles: number;//
2656+
maxParticles: number;
26382657
maxParticleScale: number;
26392658
maxParticleSpeed: Phaser.Point;
26402659
maxRotation: number;
@@ -2643,10 +2662,13 @@ declare module Phaser {
26432662
minRotation: number;
26442663
name: string;
26452664
on: boolean;
2665+
particleBringToTop: boolean;
2666+
particleSendToBack: boolean;
26462667
particleClass: Phaser.Sprite;
26472668
particleDrag: Phaser.Point;
26482669
position: Phaser.Point;
26492670
right: number;
2671+
scaleData: any[];
26502672
top: number;
26512673
type: number;
26522674
width: number;
@@ -2657,7 +2679,10 @@ declare module Phaser {
26572679
emitParticle(): void;
26582680
kill(): void;
26592681
makeParticles(keys: any, frames: any, quantity: number, collide?: boolean, collideWorldBounds?: boolean): Phaser.Particles.Arcade.Emitter;
2682+
reset(x: number, y: number, health?: number): Phaser.Particles;
2683+
setAlpha(min?: number, max?: number, rate?: number, ease?: number, yoyo?: boolean): void;
26602684
setRotation(min?: number, max?: number): void;
2685+
setScale(min?: number, max?: number, rate?: number, ease?: number, yoyo?: boolean): void;
26612686
setSize(width: number, height: number): void;
26622687
setXSpeed(min: number, max: number): void;
26632688
setYSpeed(min: number, max: number): void;
@@ -3020,8 +3045,11 @@ declare module Phaser {
30203045
applyGravity: boolean;
30213046
applySpringForced: boolean;
30223047
bounds: Phaser.Physics.P2.Body;
3048+
boundsCollidesWith: Phaser.Physics.P2.Body[];
3049+
contactMaterial: Phaser.Physics.P2.ContactMaterial;
30233050
emitImpactEvent: boolean;
30243051
enableBodySleeping: boolean;
3052+
everythingCollisionGroup: Phaser.Physics.P2.CollisionGroup;
30253053
frameRate: number;
30263054
friction: number;
30273055
game: Phaser.Game;
@@ -3231,6 +3259,23 @@ declare module Phaser {
32313259

32323260
}
32333261

3262+
class FixtureList {
3263+
3264+
constructor(list: any[]);
3265+
3266+
flatten(array: any[]): any[];
3267+
getFixtures(keys: string): any[];
3268+
getFixtureByKey(key: string): any[];
3269+
getGroup(groupID: number): any[];
3270+
init(): void;
3271+
parse(): void;
3272+
setCategory(bit: number, fictureKey: string): void;
3273+
setMask(bit: number, fixtureKey: string): void;
3274+
setMaterial(material: Object, fixtureKey: string): void;
3275+
setSensor(value: boolean, fixtureKey: string): void;
3276+
3277+
}
3278+
32343279
class GearConstraint {
32353280

32363281
constructor(world: Phaser.Physics.P2, bodyA: Phaser.Physics.P2.Body, bodyB: Phaser.Physics.P2.Body, angle?: number, ratio?: number);
@@ -4008,6 +4053,7 @@ declare module Phaser {
40084053
render(): void;
40094054
remove(key: string): void;
40104055
resume(): void;
4056+
restart(clearWorld?: boolean, clearCache?: boolean): void;
40114057
start(key: string, clearWorld?: boolean, clearCache?: boolean, ...args:any[]): void;
40124058
update(): void;
40134059

@@ -4136,7 +4182,7 @@ declare module Phaser {
41364182
addTilesetImage(tileset: string, key?: string, tileWidth?: number, tileHeight?: number, tileMargin?: number, tileSpacing?: number, gid?: number): Phaser.Tileset;
41374183
calculateFaces(layer: number): void;
41384184
copy(x: number, y: number, width: number, height: number, layer?: any): Phaser.Tile[];
4139-
create(name: string, width: number, height: number, tileWidth:number, tileHeight:number): Phaser.Tilemap;
4185+
create(name: string, width: number, height: number, tileWidth:number, tileHeight:number): Phaser.TilemapLayer;
41404186
createBlankLayer(name: string, width: number, height: number, tileWidth: number, tileHeight: number, group?: Phaser.Group): Phaser.TilemapLayer;
41414187
createFromObjects(name: string, gid: any, key: string, frame?: any, exists?: boolean, autoCull?: boolean, group?: Phaser.Group, CustomClass?: Object, adjustY?:boolean): void;
41424188
createLayer(layer: any, width?: number, height?: number, group?: Phaser.Group): Phaser.TilemapLayer;
@@ -4348,6 +4394,7 @@ declare module Phaser {
43484394
seconds: number;
43494395

43504396
add(delay: number, callback: Function, callbackContext: Object, ...args: any[]): Phaser.TimerEvent;
4397+
clearPendingEvents(): void;
43514398
destroy(): void;
43524399
loop(delay: number, callback: Function, callbackContext: Object, ...args: any[]): Phaser.TimerEvent;
43534400
order(): void;

0 commit comments

Comments
 (0)