Commit graph

7725 commits

Author SHA1 Message Date
Pavle Goloskokovic
0bce624170 Merge remote-tracking branch 'origin/master' 2017-11-30 18:18:24 +01:00
Pavle Goloskokovic
1e10ab2f1f Added case for loading audioSprite files with generic file loader method 2017-11-30 18:18:13 +01:00
Richard Davey
2e7a336ef9 Handling new style settings for fonts and padding. 2017-11-30 17:17:29 +00:00
Richard Davey
5e975eda2c font has been removed and replaced with fontFamily, fontSize and fontStyle.
fill has been replaced with color as it just makes more sense.
2017-11-30 17:17:28 +00:00
Richard Davey
4d71806bea Text padding is passed to the Text.setPadding method to handle. 2017-11-30 17:17:27 +00:00
Richard Davey
7bd8bf2075 The testString can now be set in the Text config. 2017-11-30 17:17:27 +00:00
Pavle Goloskokovic
c1010bd446 Added support for passing in json object instead of url to json file directly to audioSprite loader method 2017-11-30 18:15:51 +01:00
Michael Hadley
b53f68c84a Factor layer scale into tile culling 2017-11-30 11:15:35 -06:00
Pavle Goloskokovic
6145ff5869 Loading audioSprite only if audio is enabled and AudioFile instance is returned from AudioFile.create method 2017-11-30 18:12:08 +01:00
Pavle Goloskokovic
1ed35dfc17 Added audioSprite case for handling audio and json files after loading finishes 2017-11-30 18:09:11 +01:00
Pavle Goloskokovic
449ca11ffd Linking audio and json files when loading audioSprite and setting their linkType to audioSprite 2017-11-30 18:07:27 +01:00
Pavle Goloskokovic
8dc987b7fc Creating AudioFile in audio loader method and adding it if it's not null
Returning loader reference for call chaining
2017-11-30 18:03:16 +01:00
Pavle Goloskokovic
8de108ce68 Returning null of AudioFile instance from AudioFile create method 2017-11-30 18:01:28 +01:00
Pavle Goloskokovic
dc8ef8a148 Added audioSprite multifile loader 2017-11-30 17:59:08 +01:00
Pavle Goloskokovic
5e89c9b1c7 Merge remote-tracking branch 'origin/master' 2017-11-30 16:42:23 +01:00
Michael Hadley
85e75eafa8 Fix for coord transform between world <-> tile + expose tile -> world methods 2017-11-30 09:22:54 -06:00
Pavle Goloskokovic
9ec1fb4cd1 Removing touche events when unlocking only after promise returned from resume method gets resolved 2017-11-30 14:41:46 +01:00
Pavle Goloskokovic
5f21646e6c Merge remote-tracking branch 'origin/master' 2017-11-30 14:39:33 +01:00
Pavle Goloskokovic
1b94d7eac3 Trying to unlock Web Audio on both touchstart and touchend events 2017-11-30 14:39:24 +01:00
Michael Hadley
bde77f7b95 Blank layers - pass along map's base tile size 2017-11-30 06:56:35 -06:00
Michael Hadley
76b74c677c Tile culling: use tile's worldXY and w/h so maps with different tileset sizes work 2017-11-30 06:56:13 -06:00
Pavle Goloskokovic
26956d3172 Merge remote-tracking branch 'origin/master' 2017-11-30 13:37:41 +01:00
Pavle Goloskokovic
f692aad1b1 Replaced touchstart with touchend event when unlocking Web Audio 2017-11-30 13:37:31 +01:00
Michael Hadley
a3b8a25521 Allow tilemap to change base tile size for all tiles 2017-11-29 23:16:48 -06:00
Michael Hadley
1be6d7a681 Tilemap & Dynamic: new method for putting a 2D array of tiles at a location 2017-11-29 21:59:11 -06:00
Michael Hadley
e548b73e80 Proper support for multiple tile sizes in a tilemap
- Adds base tile size to Tile class. Tiled positions tiles based on the base size.
- Supports proper translation of Tiled's bottom left coord system to Phaser's top left coord for tiles that are bigger or smaller than the base tile size.
- Update static renderer to read position/size from tile
2017-11-29 20:06:52 -06:00
Michael Hadley
2ae4bfa85a Jsdocs: StaticTilemapLayer & DynamicTilemapLayer 2017-11-29 19:23:42 -06:00
Michael Hadley
36a92d15e7 Add note about ImageCollection being a direct v2 port 2017-11-29 19:23:42 -06:00
Michael Hadley
59cdf89836 Jsdocs: Tilemap 2017-11-29 19:23:42 -06:00
Richard Davey
d1cc12693c If a GameObject has a preDestroy method then call it before running the standard destroy calls. 2017-11-30 01:20:22 +00:00
Richard Davey
3964c7a2ac Added in support for RTL text in the Text Game Object. 2017-11-30 01:20:02 +00:00
Richard Davey
3c8a5b4132 Fixed issue where an array passed in the constructor wasn't properly displayed
fix #3094
2017-11-30 00:03:22 +00:00
Richard Davey
309cf610bb Physics Manager now calls shutdown and destroy.
Matter World properly clears out the world and its Engine on shutdown. Also fixed incorrect localWorld.remove calls (fix #3110)
2017-11-29 23:36:35 +00:00
Richard Davey
31d2262cb4 Fixed HitTest 2017-11-29 23:35:53 +00:00
Richard Davey
a45554d630 Merge branch 'master' of https://github.com/photonstorm/phaser 2017-11-29 22:24:02 +00:00
Richard Davey
a86b68e361 Removed un-needed WorldToCamera, implemented GetWorldPoint across the board 2017-11-29 22:23:58 +00:00
Michael Hadley
d6f8812f49 Jsdoc: Tile 2017-11-29 15:37:23 -06:00
Michael Hadley
a76e270c78 Jsdoc fixup: Number -> Integer, array -> Type[] 2017-11-29 15:07:56 -06:00
Michael Hadley
191f621dad Jsdocs: Tileset 2017-11-29 14:39:30 -06:00
Michael Hadley
5f3156e2b8 Jsdocs: Tilemap parsing 2017-11-29 14:02:45 -06:00
Michael Hadley
0ee08b76a8 Jsdocs: ParseToTilemap 2017-11-29 13:53:05 -06:00
Michael Hadley
382d8edfcc Jsdocs: Tilemap Creator & Factor 2017-11-29 13:46:29 -06:00
Michael Hadley
f0e59b3d3d Blank Layer: remove unnecessary setting of tile size 2017-11-29 13:23:01 -06:00
Michael Hadley
b8695342e1 Prefer UK spelling over US: indices -> indexes 2017-11-29 13:22:30 -06:00
Michael Hadley
80a16065e2 Update to allow multiple tileset sizes within one map
Tileset is source of truth for tile size, so this update makes sure that layers are sync'd with the tileset
2017-11-29 12:52:34 -06:00
Michael Hadley
184cfd1979 When creating a Tilemap layer, use Tiled layer offset if no xy specified 2017-11-29 11:59:25 -06:00
Michael Hadley
a7df7c2df9 Tidying up linting, notes and comments 2017-11-29 11:46:19 -06:00
Michael Hadley
f4a6888d86 Tilemap: add method for converting layer from dynamic to static 2017-11-29 11:36:36 -06:00
Michael Hadley
0b4a08730c Adding debug rendering method to tilemap and layers 2017-11-29 09:05:53 -06:00
Michael Hadley
60f20aa05b setTileLocationCallback 2017-11-29 08:20:24 -06:00