From b8dc3c624f64c7aa5cbf01a02680cf1c50ea54be Mon Sep 17 00:00:00 2001 From: Tim van den Eijnden Date: Wed, 22 Oct 2014 16:48:12 +0200 Subject: [PATCH 1/2] use baseURL instead of baseUrl Fixed issue with 404 when loading content on iOS8 device --- src/loader/Cache.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/loader/Cache.js b/src/loader/Cache.js index 1e22eb8bd..20edf1e7f 100644 --- a/src/loader/Cache.js +++ b/src/loader/Cache.js @@ -1476,7 +1476,7 @@ Phaser.Cache.prototype = { * @private */ _resolveUrl: function (url) { - this._urlResolver.src = this.game.load.baseUrl + url; + this._urlResolver.src = this.game.load.baseURL + url; this._urlTemp = this._urlResolver.src; From 9a4779ac6ec828e00c2531549a62acbb969d89cf Mon Sep 17 00:00:00 2001 From: Tim van den Eijnden Date: Wed, 7 Jan 2015 15:08:00 +0100 Subject: [PATCH 2/2] updated typescript definitions --- typescript/phaser.d.ts | 8 +++++--- typescript/pixi.d.ts | 6 +++++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/typescript/phaser.d.ts b/typescript/phaser.d.ts index 157960b89..3e5da2fc6 100644 --- a/typescript/phaser.d.ts +++ b/typescript/phaser.d.ts @@ -1,6 +1,6 @@ /// -// Type definitions for Phaser dev2.2.0 RC12 2015-02-01 +// Type definitions for Phaser dev2.2.0 RC12 2015-07-01 // Project: https://github.com/photonstorm/phaser declare class Phaser { @@ -1126,7 +1126,7 @@ declare module Phaser { class Game { - constructor(width?: number, height?: number, renderer?: number, parent?: any, state?: any, transparent?: boolean, antialias?: boolean, physicsConfig?: any); + constructor(width?: any, height?: any, renderer?: number, parent?: any, state?: any, transparent?: boolean, antialias?: boolean, physicsConfig?: any); constructor(config: IGameConfig); add: Phaser.GameObjectFactory; @@ -1684,7 +1684,7 @@ declare module Phaser { disableDrag(): void; disableSnap(): void; downDuration(pointer: Phaser.Pointer): number; - enableDrag(lockCenter?: boolean, bringToTop?: boolean, pixelPerfect?: boolean, alphaThreshold?: number, boundsRect?: Phaser.Rectangle, boundsSprite?: Phaser.Rectangle): void; + enableDrag(lockCenter?: boolean, bringToTop?: boolean, pixelPerfect?: boolean, alphaThreshold?: number, boundsRect?: Phaser.Rectangle, boundsSprite?: Phaser.Sprite): void; enableSnap(snapX: number, snapY: number, onDrag?: boolean, onRelease?: boolean, snapOffsetX?: number, snapOffsetY?: number): void; isPixelPerfect(): boolean; justOut(pointer: number, delay: number): boolean; @@ -4054,6 +4054,8 @@ declare module Phaser { setShadow(x?: number, y?: number, color?: any, blur?: number): void; setStyle(style?: { font?: string; fill?: any; align?: string; stroke?: string; strokeThickness?: number; wordWrap?: boolean; wordWrapWidth?: number; shadowOffsetX?: number; shadowOffsetY?: number; shadowColor?: string; shadowBlur?: number; }): void; update(): void; + updateTexture(): void; + updateLine(text:string, x?:number, y?:number): void; } diff --git a/typescript/pixi.d.ts b/typescript/pixi.d.ts index 82071698a..dbb09916b 100644 --- a/typescript/pixi.d.ts +++ b/typescript/pixi.d.ts @@ -1,4 +1,4 @@ -// Type definitions for PIXI 2.2.0 dev 2014-16-12 +// Type definitions for PIXI 2.2.0 dev 2015-01-01 // Project: https://github.com/GoodBoyDigital/pixi.js/ declare module PIXI { @@ -1101,6 +1101,10 @@ declare module PIXI { constructor(text: string, style?: TextStyle); + static fontPropertiesCanvas: any; + static fontPropertiesContext: any; + static fontPropertiesCache: any; + context: CanvasRenderingContext2D; resolution: number;