wassname/phaser
1
0
Fork 0
mirror of https://github.com/wassname/phaser.git synced 2026-06-28 16:20:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'origin/dev'

Browse Source
This commit is contained in:
photonstorm
2014-02-09 19:59:03 +00:00
parent bca64c2adb 62da24a7fc
commit 9ee5cdaded
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/phaser.d.ts
Vendored
+4 -3
View File
@@ -845,6 +845,7 @@ declare module Phaser {
visible: boolean;
renderable: boolean;
width: number;
height: number;
health: number;
damage(amount: number): Phaser.Sprite;
}
@@ -1645,9 +1646,9 @@ declare module Phaser {
tilemap(key: string, tilesetURL: string, mapDataURL?: string, mapData?: Object, format?: string): void;
tileset(key: string, url: string, tileWidth: number, tileHeight: number, tileMargin?: number, tileSpacing?: number, rows?: number, columns?: number, limit?: number): void;
bitmapFont(key: string, textureURL: string, xmlURL?: string, xmlData?: Object): void;
atlasJSONArray(key: string, textureURL: string, atlasURL: string, atlasData: Object): void;
atlasJSONHash(key: string, textureURL: string, atlasURL: string, atlasData: Object): void;
atlasXML(key: string, textureURL: string, atlasURL: string, atlasData: Object): void;
atlasJSONArray(key: string, textureURL: string, atlasURL?: string, atlasData?: Object): void;
atlasJSONHash(key: string, textureURL: string, atlasURL?: string, atlasData?: Object): void;
atlasXML(key: string, textureURL: string, atlasURL?: string, atlasData?: Object): void;
atlas(key: string, textureURL: string, atlasURL?: string, atlasData?: Object, format?: number): void;
removeFile(key: string): void;
removeAll(): void;
src/utils/Utils.js
+3 -3
View File
@@ -38,9 +38,9 @@ Phaser.Utils = {
* dir = 1 (left), 2 (right), 3 (both)
* @method Phaser.Utils.pad
* @param {string} str - The target string.
* @param {number} len - Description.
* @param {number} pad - the string to pad it out with (defaults to a space).
* @param {number} [dir=3] the direction dir = 1 (left), 2 (right), 3 (both).
* @param {number} len - The number of characters to be added.
* @param {number} pad - The string to pad it out with (defaults to a space).
* @param {number} [dir=3] The direction dir = 1 (left), 2 (right), 3 (both).
* @return {string} The padded string
*/
pad: function (str, len, pad, dir) {