Commit graph

1972 commits

Author SHA1 Message Date
Michael Hadley
195ea19ea7 Extra tilemap method findTile (matches Array.prototype.find) 2017-12-01 13:46:27 -06:00
Michael Hadley
a8fdcbc56b Small fix: use base tile size for tile <-> XY transforms. This only matters for maps with different size tiles. 2017-12-01 13:26:09 -06:00
Michael Hadley
37767ebde1 Tidy: fix v2 linting errors and move Tiled parser bits into modules 2017-12-01 13:26:09 -06:00
Michael Hadley
ed5cdf0bdb Tidy up - remove old skipIndexZero property on layers 2017-12-01 13:26:09 -06:00
Michael Hadley
742ff1a439 Internal terminology change to make API clearer: tile.worldXY -> tile.pixelXY 2017-12-01 13:26:09 -06:00
Richard Davey
3a0c276810 preDestroy added and event fix. 2017-12-01 18:19:25 +00:00
Richard Davey
81275a6197 Fixed transform issue with Text padding. 2017-12-01 16:53:02 +00:00
Pavle Goloskokovic
66d216af19 Reading total rate value directly from totalRate property in setRate 2017-12-01 15:41:24 +01:00
Pavle Goloskokovic
a3dbb51d3e Removed return value for setRate method as it is not needed because that value is now stored in totalRate property 2017-12-01 15:40:35 +01:00
Pavle Goloskokovic
411fdd48b2 Setting totalRate value in setRate method 2017-12-01 15:33:02 +01:00
Pavle Goloskokovic
fe9c9c0819 Added totalRate property to BaseSound class 2017-12-01 15:32:03 +01:00
Pavle Goloskokovic
4721d074e8 Merge remote-tracking branch 'origin/master' 2017-12-01 13:16:59 +01:00
Richard Davey
f2c05d2b0d Merge branch 'master' of https://github.com/photonstorm/phaser 2017-12-01 03:12:00 +00:00
Richard Davey
d0fb5a69f4 Allows for 'font' and 'fill' overrides 2017-12-01 03:11:57 +00:00
Richard Davey
b393aed2e3 Fixed setPadding and padding value assignment 2017-12-01 03:11:41 +00:00
Richard Davey
025c9dc131 Padding now passed in the style object and avoids double call to updateText 2017-12-01 03:11:23 +00:00
Michael Hadley
01f34e18b7 Recalculate faces: make this reset faces on non-colliding tiles
This handles edge cases where things like copy can make a tile become non-colliding w/o reseting faces
2017-11-30 17:19:19 -06:00
Pavle Goloskokovic
42b47d2674 Fixed few references 2017-11-30 22:56:54 +01:00
Pavle Goloskokovic
c1adc63ffd Merge remote-tracking branch 'origin/master' 2017-11-30 22:16:03 +01:00
Pavle Goloskokovic
786c6913ac Removing WebAudioSpriteSound class, audio sprite creation logic is generic and can be used in base sound manager class, no need for adding more classes and making class hierarchy more complex 2017-11-30 22:15:47 +01:00
Pavle Goloskokovic
9e90b9eec2 Moved logic for audio sprite creation to BaseSoundManager addAudioSprite method 2017-11-30 22:14:20 +01:00
Felipe Alfonso
ef942fb204 Premultiplied Alpha blending 2017-11-30 16:05:45 -03:00
Michael Hadley
0993af649a Bug fix: extend from empty object 2017-11-30 12:26:07 -06:00
Pavle Goloskokovic
9a3d0a4140 Added hasOwnProperty check for traversing spritemap object 2017-11-30 18:56:38 +01:00
Pavle Goloskokovic
5c3a3ebef2 Improve readability with local variable 2017-11-30 18:56:12 +01:00
Pavle Goloskokovic
9a156ec898 Adding marker for each key in spritemap object 2017-11-30 18:55:21 +01:00
Pavle Goloskokovic
d65cf17a4d Added spritemap property to WebAudioSpriteSound that holds reference to 'spritemap' object form json file generated by audiosprite tool. 2017-11-30 18:54:27 +01:00
Pavle Goloskokovic
39edc8a9ac Defaulting config to empty object and calling super method in WebAudioSpriteSound constructor 2017-11-30 18:53:12 +01:00
Pavle Goloskokovic
6412a3c3c2 Added WebAudioSpriteSound class - a Web Audio implementation of audio sprite sound 2017-11-30 18:50:54 +01:00
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
Michael Hadley
da79734b22 SetTileIndexCallback 2017-11-29 07:53:04 -06:00
Michael Hadley
b4d89fb554 createFromObjects: return an array of sprites 2017-11-29 07:35:26 -06:00
Michael Hadley
a0b4362979 createFromObjects: allow sprite to have any origin while still matching Tiled 2017-11-29 07:25:04 -06:00
Michael Hadley
ee5190660c Tilemap: upgraded version of createFromObjects from v2 2017-11-28 22:40:48 -06:00
Michael Hadley
e5a8600686 BuildGameObject bug: origin was being set to position xy 2017-11-28 21:57:52 -06:00
Michael Hadley
68634a0deb Tilemap & layer methods: FilterTiles & CreateFromTiles 2017-11-28 20:49:24 -06:00
Richard Davey
3129950d34 Updated call 2017-11-29 02:25:14 +00:00
Felipe Alfonso
3b296162cf Camera input transform update 2017-11-28 19:18:05 -03:00
Pavle Goloskokovic
e9a71beba7 Merge remote-tracking branch 'origin/master' 2017-11-28 16:34:48 +01:00
Richard Davey
c58b295fcc Added positionToCamera method (but still needs fixing) 2017-11-28 11:16:35 +00:00
Richard Davey
e194b95654 PointerConstraint now takes the scene camera it should use as a config option. 2017-11-28 11:16:23 +00:00
Richard Davey
d9a9c7a5a1 esline tidy-up. 2017-11-28 11:15:45 +00:00
Richard Davey
4969bf37e6 The local input manager has a reference to the active pointer. 2017-11-28 11:15:35 +00:00
Richard Davey
f9cda636c5 Added Camera.screenToCamera and setAngle methods. 2017-11-28 11:15:22 +00:00
Pavle Goloskokovic
6f7f5f6144 Merge remote-tracking branch 'origin/master' 2017-11-27 18:13:26 +01:00
Richard Davey
1380af61a1 Added render visible flag. 2017-11-27 17:01:27 +00:00
Pavle Goloskokovic
35e25ab633 Merge remote-tracking branch 'origin/master' 2017-11-27 17:38:51 +01:00
Pavle Goloskokovic
65c30b9f7a Removed detune property as it is now defined in BaseSoundManager class 2017-11-27 17:38:43 +01:00
Pavle Goloskokovic
e4cebbf29c Removed rate property as it is now defined in BaseSoundManager class 2017-11-27 17:38:28 +01:00
Pavle Goloskokovic
3c2670a2f9 Removed _detune field as it is now set in BaseSoundManager class 2017-11-27 17:37:41 +01:00
Pavle Goloskokovic
c84a00e248 Removed _rate field as it is now set in BaseSoundManager class 2017-11-27 17:37:11 +01:00
Pavle Goloskokovic
28ae0811e6 Defining detune property in BaseSound class so it can be used in both Web Audio and HTML5 Audio implementations 2017-11-27 17:35:35 +01:00
Pavle Goloskokovic
1c1e75ac85 Defining rate property in BaseSound class so it can be used in both Web Audio and HTML5 Audio implementations 2017-11-27 17:35:09 +01:00
Pavle Goloskokovic
27ad50d276 Setting _detune field in BaseSound class so it can be used in both Web Audio and HTML5 Audio implementations 2017-11-27 17:34:27 +01:00
Pavle Goloskokovic
92ac9d41c5 Setting _rate field in BaseSound class so it can be used in both Web Audio and HTML5 Audio implementations 2017-11-27 17:33:37 +01:00
Pavle Goloskokovic
cf46145d7c Calling super method in setRate method of WebAudioSound class, setting returned value to source playback rate audio param and returning the same value to match method signature 2017-11-27 17:32:16 +01:00
Pavle Goloskokovic
f389176362 Added setRate method to BaseSound class that contains logic for applying rate and detune settings to sound so it can be reused in both Web Audio and HTML5 Audio implementations 2017-11-27 17:30:55 +01:00
Richard Davey
6da5409688 Added in all of the Composites helpers. 2017-11-27 16:29:43 +00:00
Richard Davey
f24b808ee5 Added setGravity defaults and fixed nextGroup method. 2017-11-27 16:29:33 +00:00
Pavle Goloskokovic
c253e01cac Merge remote-tracking branch 'origin/master' 2017-11-27 17:22:32 +01:00
Pavle Goloskokovic
881474b7cd Added a TODO to take into account playback rate when pausing and resuming sound 2017-11-27 16:50:45 +01:00
Pavle Goloskokovic
ffc205b400 Calling setRate method on all sound objects when updating global detune value 2017-11-27 16:50:05 +01:00
Pavle Goloskokovic
c57f692c85 Calling setRate method on all sound objects when updating global rate value 2017-11-27 16:49:28 +01:00
Pavle Goloskokovic
9fffd57ad3 Moved sound source not null check from properties' setter methods to setRate method 2017-11-27 16:48:20 +01:00
Pavle Goloskokovic
db06b3d742 Calling setRate in WebAudioSound detune property's setter method 2017-11-27 16:46:42 +01:00
Pavle Goloskokovic
074c60c270 Calling setRate in WebAudioSound rate property's setter method 2017-11-27 16:45:58 +01:00
Pavle Goloskokovic
1fddd3de2a Added setRate method to WebAudioSound class that calculates and sets playback rate based on sound's and manager's detune and rate values 2017-11-27 16:44:23 +01:00
Richard Davey
ac9f5c4360 Added quick support for setCircle, setRectangle, setPolygon and setTrapezoid. 2017-11-27 14:48:09 +00:00
Richard Davey
036e7aecc9 If property is undefined fall back to the default value. 2017-11-27 14:48:09 +00:00
Michael Hadley
bd8a2fa39b More tilemap jsdocs 2017-11-27 07:33:30 -06:00
Michael Hadley
e45bc5c71d PutTileAt: copy all tile properties from source tile 2017-11-27 07:19:20 -06:00
Richard Davey
da5bb7d199 Merge branch 'master' of https://github.com/photonstorm/phaser 2017-11-27 03:46:10 +00:00
Richard Davey
15a2280813 Added basic Graphics debug, fromPath, isPaused and postUpdate. 2017-11-27 03:45:46 +00:00
Richard Davey
af9f7380e8 Added property 2017-11-27 03:45:12 +00:00
Richard Davey
f8fe81dfa1 New setBody component for setting and change body shape 2017-11-27 03:45:03 +00:00
Richard Davey
ff316be41e setFriction can now set all 3 values. 2017-11-27 03:44:31 +00:00
Richard Davey
cd629248d0 fix inertia change in Body.setMass 2017-11-26 23:25:49 +00:00
Richard Davey
bccad674b7 fix point argument of Body.scale 2017-11-26 23:24:16 +00:00
Richard Davey
5862949a4c fix centroid for static compound bodies 2017-11-26 23:19:45 +00:00
Richard Davey
dc7289e539 Fix Vertices.chamfer radius argument 2017-11-26 23:17:12 +00:00
Pavle Goloskokovic
d13fae2260 Preventing negative values for source start call 2017-11-26 18:12:55 +01:00
Pavle Goloskokovic
150c29a8a0 Merge remote-tracking branch 'origin/master' 2017-11-26 17:25:47 +01:00
Pavle Goloskokovic
93ac04329b Updated WebAudioSound update method docs and signature 2017-11-26 17:25:01 +01:00
Pavle Goloskokovic
66dcd9f02f Resetting hasEnded in update method 2017-11-26 17:07:56 +01:00
Pavle Goloskokovic
0a078d26f6 Setting hasEnded when sound ends 2017-11-26 17:07:05 +01:00
Pavle Goloskokovic
f0bc96e68f Checking hasEnded on update in order to call stop method 2017-11-26 17:05:24 +01:00
Pavle Goloskokovic
84e6459b59 Added hasEnded property to WebAudioSound class 2017-11-26 17:03:36 +01:00
Pavle Goloskokovic
94e834fa96 Updating all sounds on sound manager update 2017-11-26 16:59:12 +01:00
Pavle Goloskokovic
62ca1bef8a Updating sound manager on game step 2017-11-26 16:45:07 +01:00
Pavle Goloskokovic
ceeef0368c Added a todo to fix race condition 2017-11-26 16:41:46 +01:00
Pavle Goloskokovic
2995b7eaf6 Added short logic explanation for onended event handler 2017-11-26 16:37:03 +01:00
Pavle Goloskokovic
e13b829ab1 Removed redundant check in onended handler and reverted setting source to null before calling stop() on it since it does not invoke onended event handler immediately 2017-11-26 16:35:13 +01:00
Michael Hadley
dabe3d27ff Tilemap: more jsdocs 2017-11-26 09:33:19 -06:00
Richard Davey
10d7be0785 Merge branch 'master' of https://github.com/photonstorm/phaser 2017-11-26 15:31:51 +00:00
Richard Davey
3ee14a88a6 Removed referene to Mouse class (no longer used) 2017-11-26 15:31:48 +00:00
Richard Davey
b85b341bfd Removed references to the Render class (only needed in debug and saved loads of space in the build file) 2017-11-26 15:31:34 +00:00
Pavle Goloskokovic
007a565700 Just checking for null sound reference isn't enough since because calling play() on already playing sound is not covered by that condition 2017-11-26 16:31:06 +01:00
Richard Davey
d4fd2082f2 Removed un-used RenderPixi class 2017-11-26 15:31:04 +00:00
Richard Davey
d1fb8319b2 Removed old module entry point and added license 2017-11-26 15:30:52 +00:00
Richard Davey
f6a5463131 Removed Mouse class from matter.js as it's not used. 2017-11-26 15:30:26 +00:00
Pavle Goloskokovic
aab5150016 Setting source to null before calling stop on it to determine if onended event was fired when sound ended or when it was stopped by user 2017-11-26 16:28:54 +01:00