Commit graph

1836 commits

Author SHA1 Message Date
Richard Davey
198f353c9a The default Container Blend Mode is now SKIP_TEST. This allows you to either set a blend mode for a Container, in which case all children use that blend mode. Or, you can set a blend mode on the children and the children will render using their own blend modes, as the Container doesn't have one set. The WebGL and Canvas Renderer functions have also been updated to support this change. Fix #3684 2018-08-21 22:07:35 +01:00
Richard Davey
01290afda9 A Game Object couldn't have a blend mode of SKIP_TEST set by using the getter or the setBlendMode method. 2018-08-21 21:54:38 +01:00
TadejZupancic
bff7f99fe1
Update RenderTexture.js 2018-08-21 15:40:10 +02:00
TadejZupancic
50a3555cad
RenderTexture: Texture is always destroyed
Texture is now destroyed only if it was not saved to the TextureManager, so it can be reused.
2018-08-21 15:32:10 +02:00
Richard Davey
8d1caff0a4 Updated argument name 2018-08-21 02:29:54 +01:00
Richard Davey
0eef6f1bb9 Updated scroll factor docs to clarify impact on physics bodies #3810 2018-08-20 19:19:53 +01:00
Richard Davey
e71d72ec66
Merge pull request #3927 from TadejZupancic/patch-11
Wrong bounds/displayOrigin on BitmapText text change
2018-08-20 18:21:15 +01:00
Richard Davey
27c3cc30ac Previously, changing a Text object by setting its text property directly wouldn't change the text being rendered as using setText was the expected way to change what was being displayed. Internally the text property has been renamed to _text and flagged as private, and a new getter / setter for text has been added, which hands over to the setText method, meaning you can now use both ways of setting the text. Fix #3919 2018-08-20 17:41:05 +01:00
Richard Davey
54dbdce1c7 Now calls the correct frame resize method. Fix #3913 2018-08-20 17:06:06 +01:00
TadejZupancic
7992924aae
Wrong bounds/displayTextOrigin on BitmapText text change
updateDisplayOrigin needs current width and height, which are not recalculated if the _dirty is not set to true.
2018-08-14 12:15:59 +02:00
Richard Davey
fe2ddcf934 Updated jsdocs 2018-08-08 17:03:08 +01:00
Richard Davey
84ef115c67 Remove un-used code 2018-08-08 15:01:41 +01:00
Richard Davey
25268d2a40 Recalc size on content change. 2018-08-08 15:01:29 +01:00
Richard Davey
353b7b5edd RenderTexture destroy working. Fix #3901 2018-08-08 13:56:43 +01:00
Richard Davey
f9e498353d Fixed lack of TempMatrix for Graphics generateTexture 2018-08-06 16:19:30 +01:00
Richard Davey
26cc84522d The CanvasRenderer.BlitImage function has been removed, as has the associated blitImage property from the Canvas Renderer as they're no longer used. 2018-08-06 15:29:27 +01:00
Richard Davey
50821c29ac Updated jsdocs 2018-08-06 13:45:56 +01:00
Richard Davey
7eda747230
Merge pull request #3891 from FelixNemis/retrofont-line-spacing
Add lineSpacing option to RetroFont Config
2018-08-06 11:46:05 +01:00
Richard Davey
41c9f8b1e1 Docs update 2018-08-06 00:41:34 +01:00
Charles Burnham
6a1c677677 Add lineSpacing option to RetroFont Config 2018-08-04 12:52:27 -05:00
Richard Davey
9675c269e6 Split Camera up into BaseCamera, which Camera now extends. 2018-08-04 13:05:41 +01:00
Richard Davey
4deb8e49ad eslint fixes 2018-08-03 19:37:42 +01:00
Richard Davey
6027e9ca5a Render Textures can now be cropped. Added missing jsdocs. 2018-08-03 19:30:55 +01:00
Richard Davey
d5c558b8e4 Render Texture now uses unified drawing functions 2018-08-03 19:17:39 +01:00
Richard Davey
82251cd85b Removed Matrix Stack. No longer needed. 2018-08-03 19:17:12 +01:00
Richard Davey
2ab24c49c4 Tile Sprites updated to use new internal canvas and support crop 2018-08-03 19:14:06 +01:00
Richard Davey
e91d95e107 Text updated to use proper texture frame and now supports crop 2018-08-03 19:07:12 +01:00
Richard Davey
708a857a26 SetTransform is a new Canvas Renderer function that consolidates the process of preparing a Game Object for rendering, without actually rendering it. This is used internally by the Graphics and Bitmap Text classes. 2018-08-03 19:02:43 +01:00
Richard Davey
0a35275c1a TransformMatrix.setToContext is a new method that will set the values from the Matrix to the given Canvas Rendering Context using setTransform rather than transform. 2018-08-03 18:55:33 +01:00
Richard Davey
ca68904953 The Canvas Renderer has a new batchSprite method that consolidates the process of drawing a texture-based Game Object to the canvas. It processes the alpha, blend mode and matrix calculations in a single function and now is used by nearly all Game Object canvas renderers. 2018-08-03 18:53:50 +01:00
Richard Davey
c98f5edc23 Added resetCropObject method to cut down on duplicate code. 2018-08-03 18:50:36 +01:00
Richard Davey
b65cf0647b New Crop Game Object component. 2018-08-03 18:49:10 +01:00
Richard Davey
fc0dc13930 Removed use of currentBlendMode and currentAlpha 2018-08-03 01:53:51 +01:00
Richard Davey
9f44896a3f The Blend Mode is now set directly in all Canvas Renderers without comparing it to what's stored in the Canvas Renderer. This fixes problems where the blend mode would be lost between two different Game Objects because they restored the context, but didn't update the renderer flag. Game Objects in Canvas can now mix and match blend modes across the display list. 2018-08-03 01:29:18 +01:00
Richard Davey
e0918df6b0 Canvas particle renderer now using same matrix math as webgl 2018-08-03 01:04:46 +01:00
Richard Davey
0a035353fa lint fix 2018-08-03 01:04:25 +01:00
Richard Davey
1b5f084640 Added jsdoc 2018-08-03 00:34:21 +01:00
Richard Davey
66f6f9abc1 Removed un-used matrix 2018-08-02 22:14:23 +01:00
Richard Davey
2a8dbb0c42 Removed un-used vars 2018-08-02 17:33:01 +01:00
Richard Davey
9ccb594958 Fixed Graphics Canvas Renderer so it uses the matrix values properly. 2018-08-02 17:24:29 +01:00
Richard Davey
c4c8b9e6ea Added copyToContext method 2018-08-02 17:23:52 +01:00
Richard Davey
674fc487ec Added missing commands 2018-08-02 17:03:41 +01:00
Richard Davey
20b74e746a Fixed parent order 2018-08-02 16:19:14 +01:00
Richard Davey
7965c7aae4 Removed un-needed files. 2018-08-02 15:59:29 +01:00
Richard Davey
b83c8cf513 Merged all the functions into the single class and tidied up the naming. 2018-08-02 14:58:09 +01:00
Richard Davey
122e6cab8a Fixed frame var 2018-08-02 12:35:26 +01:00
Richard Davey
affe47714f Render Textures can now save themselves to the Texture Manager. 2018-08-02 12:35:17 +01:00
Richard Davey
72d54dd1ac Only clear if dirty. Only render children is visible. 2018-08-01 20:25:55 +01:00
Richard Davey
c9e0963696 Added dirty fag 2018-08-01 20:25:40 +01:00
Richard Davey
a11b059531 Draw a whole Scene now! 2018-08-01 18:28:14 +01:00
Richard Davey
c9efa21cfd Added getChildren to keep inline with Group 2018-08-01 18:28:06 +01:00
Richard Davey
9bc71dc676 New handler so RenderTextures can draw any game object, group or container 2018-08-01 18:02:21 +01:00
Richard Davey
56a0b3b3bf Expose more functions (until we tidy this up) 2018-08-01 18:02:05 +01:00
Richard Davey
86b829efa6 Blank the texture after drawing 2018-08-01 18:01:54 +01:00
Richard Davey
d50b72dd14 Fixed Group creation arguments 2018-08-01 18:01:36 +01:00
Richard Davey
46552c8f2e Remove strict check 2018-08-01 16:04:08 +01:00
Richard Davey
9977497137 Fixed Group config / children detection 2018-08-01 15:19:56 +01:00
Richard Davey
94e4411ac1 Testing RenderTexture updates to allow any GameObject to be drawn to it 2018-08-01 00:01:16 +01:00
Richard Davey
7313573161 The ParticleEmitterManager now has the Transform component. This means you can now set the position, rotation or scale of the Emitter Manager, and it will influence every Emitter it is rendering. The Managers transform is mixed with that of the Camera. This works in both Canvas and WebGL. 2018-07-31 23:21:07 +01:00
Richard Davey
c3cc4317dd Particle.color has been removed as it's now calculated during rendering to allow for Camera alpha support. 2018-07-31 23:18:49 +01:00
Richard Davey
9d7ec132a4 Refactoring RenderTexture to remove the matrix stack and add in support for drawing Game Objects and arrays of them 2018-07-31 17:10:26 +01:00
Richard Davey
8cb812bbec Merged jsdocs (re: #3823) 2018-07-31 15:13:21 +01:00
Richard Davey
84ae027665 lint fix 2018-07-31 12:59:11 +01:00
Richard Davey
718d72b4c8 Container child willRender check. Fix #3881 2018-07-31 12:57:31 +01:00
Richard Davey
eb30a2118b
Merge pull request #3872 from ampled/master
add typedef for SpriteConfig and allowed GameObject#update signature override
2018-07-31 11:38:06 +01:00
Chris Andrew
634edcf538 Fixed Graphics.generateTexture() causing a runtime error (#3879).
The Graphics object had new dependencies (1a62a356) that were not provided when the static Graphics.TargetCamera object was used by the Graphics.generateTexture() method. Providing a Graphics instances scene object to the TargetCamera at texture rendering time resolved the issue.
2018-07-30 23:02:40 +01:00
Richard Davey
a8b605f42d Zone now calls updateDisplayOrigin in its constructor, causing the displayOriginX and displayOriginY values to now be correct if you create a Zone and then don't resize it. Fix #3865 2018-07-29 12:34:21 +01:00
Richard Davey
7fe9167657 The alpha value is now always set for Render Textures in canvas mode, regardless of the previous alpha value in the renderer 2018-07-29 12:23:52 +01:00
Richard Davey
a1ae1744ac RenderTexture.preDestroy will now release the canvas back to the CanvasPool if running in canvas mode
Also removed un-used `drawFrame` references.
2018-07-29 12:20:09 +01:00
Richard Davey
34b27fd57a ParticleEmitter would fail to draw a textured particle in Canvas mode 2018-07-29 12:16:42 +01:00
Richard Davey
56e1e04da3 RenderTexture.draw would fail to draw the frame in Canvas mode 2018-07-29 12:10:28 +01:00
Richard Davey
7e55d5adac BlitterCanvasRenderer would fail to render a Bob in Canvas mode if it was flipped 2018-07-29 12:09:03 +01:00
Eirik Slinning Korsnes
09113cb7a3
wrap ({number|string)} 2018-07-29 12:47:33 +02:00
ampled
50c787a9c8 - add typedef for SpriteConfig extends GameObjectConfig
- allow update-function signature to be overriden by GameObject subclasses
2018-07-29 12:19:04 +02:00
Richard Davey
1abe90433f Updated log and docs 2018-07-27 02:49:05 +01:00
Richard Davey
a63acd0427 Updated docs. 2018-07-27 02:40:56 +01:00
Richard Davey
6027b65500 Added fill gradient and line gradient methods 2018-07-27 02:13:58 +01:00
Richard Davey
0c50b0eba8 Typo 2018-07-27 02:13:41 +01:00
Richard Davey
4481795d32 Swapped to using getX / getY 2018-07-27 00:53:00 +01:00
Richard Davey
8873bdcbf6 Fixed pipeline method call 2018-07-26 23:50:54 +01:00
Richard Davey
cc3ed1659e Lint fix. 2018-07-26 16:33:51 +01:00
Richard Davey
5dbd7591cd Graphics now using the TextureTintPipe. Farewell draw calls! 2018-07-26 16:33:02 +01:00
Richard Davey
1cc0e7d5e5 Moved the rendering code from the pipeline to the Graphics object 2018-07-26 15:04:35 +01:00
Richard Davey
620c5a3360 Added Graphics.setTexture and a clear texture command 2018-07-26 15:04:19 +01:00
Thomas Felix
43f6b1d231 fix: Corrects the wrong JSdoc comments
Wrong comments lead to a faulty Typescript Definition file missing
the depth attribute.
2018-07-25 22:13:38 +02:00
Richard Davey
9e40b16e4f Added getX and getY to cut down on code in pipelines. 2018-07-25 01:26:41 +01:00
Richard Davey
05a6275d9a Added copyToArray method. 2018-07-25 00:18:33 +01:00
Richard Davey
50de14b132
Merge pull request #3857 from khaleb85/master
Added reverse animation feature (issue: #3837)
2018-07-24 13:41:10 +01:00
khaleb
6b81bc78a3 added since 3.12.0 in new methods, fixed keywords-spacing issue, renamed 'revert' method to 'reverse' 2018-07-24 09:28:56 -03:00
Richard Davey
9df7fbaa68 Adding an array of children to a Group would cause it to mistakenly think you were passing a config object. Fix #3854 2018-07-23 13:29:39 +01:00
Richard Davey
fc5eb2511c Particles using a blend mode wouldn't render correctly after the updates in 3.11. If the blend mode changes during the processing of an emitter manager it'll now correctly rebind the texture, stopping the particles from vanishing. Fix #3851 2018-07-23 01:39:21 +01:00
Shukizu
8da8fbedd1 fix animations with yoyo mode (issue: #3837) 2018-07-22 14:57:07 -03:00
Shukizu
bb17c82bf9 Added 'playReverse' method, and extracted part of play method (issue #3837) 2018-07-22 12:42:59 -03:00
Shukizu
ebc9d8d96d Add a 'revert' function that can revert the flow of a animation at any time (issue #3837) 2018-07-22 11:44:57 -03:00
Richard Davey
4f6790f450 Trying not rotate. Speed was the same :) 2018-07-20 17:50:01 +01:00
Richard Davey
c1a4fb0092 typo 2018-07-20 17:49:49 +01:00
Richard Davey
7b50a87c3e Added getChild methods 2018-07-19 16:22:58 +01:00
Richard Davey
106e32a4f5 Removed un-used imports 2018-07-19 13:26:11 +01:00
Richard Davey
de4428ac52 Added willRender override and start of event handling 2018-07-19 13:22:13 +01:00
Richard Davey
ec5bd1912e GameObject.willRender now takes a Camera as its only argument and uses it within the check. This has allowed me to remove 23 duplicate checks spread across the various Game Objects, all of which did the same thing, saving both KB and CPU time as the flags were being checked twice in most cases. 2018-07-19 13:19:02 +01:00
Richard Davey
e2dbbcdbb0 Inline and added create methods 2018-07-19 00:42:28 +01:00
Richard Davey
ceb466748a Updated DOM Element to fix transforms 2018-07-19 00:22:38 +01:00
Richard Davey
d6fb66789f Added getCSSMatrix 2018-07-19 00:22:10 +01:00
Richard Davey
ab35dfab95 The setCrop method stored its crop object on the prototype chain by mistake, causing all Images or Sprites that were cropped to display the same frame. The crop data has been moved to the Game Object instance, where it should be, fixing this issue 2018-07-19 00:18:09 +01:00
Richard Davey
0ed4766fe3 Added start of the new DOM Element Game Object 2018-07-18 17:23:04 +01:00
Richard Davey
14ba51d928 Added Text.setResolution methods. 2018-07-18 14:45:10 +01:00
Richard Davey
94540e112e Text supports high dpi resolution for its internal canvas 2018-07-17 22:44:12 +01:00
Richard Davey
c8b058c26a Renamed object to avoid TS defs conflict 2018-07-16 10:28:28 +01:00
Richard Davey
66ee2ac973 Bumped version 2018-07-13 11:14:13 +01:00
Richard Davey
eee96cd2d3 setPipeline returns the Game Object, not the pipeline, to be consistent. 2018-07-13 11:14:08 +01:00
Richard Davey
aa9ba84766
Merge pull request #3741 from TadejZupancic/patch-5
Zone inside a Container fix
2018-07-13 08:30:13 +01:00
Richard Davey
13776e5116 Fixed argument order. 2018-07-11 16:54:48 +01:00
Richard Davey
51f94cd444 Merge branch 'master' of https://github.com/photonstorm/phaser 2018-07-11 16:25:26 +01:00
Richard Davey
5ba80defb7 Pass GO to setPipeline 2018-07-11 16:23:44 +01:00
Chris Andrew
0858797599 Minor documentation fix for BitmapText.getTextBounds(). 2018-07-11 14:50:23 +01:00
Richard Davey
82b15c8695 Removed drawEmitterManager and moved to emitter render function 2018-07-11 14:40:36 +01:00
Richard Davey
497fa1f2ff Added copyFromArray method 2018-07-11 12:36:49 +01:00
Richard Davey
ef79edf1ff New pipeline function call 2018-07-11 12:35:23 +01:00
Richard Davey
b7edbe755f Tidying up function 2018-07-11 12:35:09 +01:00
Richard Davey
9c9e9cecbb Updated log and lint fixes 2018-07-10 16:49:53 +01:00
Richard Davey
5fe74453fe Extends BitmapText, to save on lots of space 2018-07-10 16:33:13 +01:00
Richard Davey
e145b6b7d3 Fixed Dynamic Bitmap Text Rendering 2018-07-10 16:33:01 +01:00
Richard Davey
469f6b6880 TransformMatrix.multiply has a new optional argument out which is a matrix to store the multiplication results in. If not given it will act as before, multiplying the current matrix. 2018-07-10 14:01:14 +01:00
Richard Davey
434c8d1413 Fixed issue with sprite matrix and camera scaling 2018-07-10 13:59:49 +01:00
Richard Davey
6560f51699 Added jsdocs and updated change log 2018-07-09 22:35:48 +01:00
Richard Davey
39c05e4a96 Added support for BitmapText alignment and internal dirty flag for calculation speed 2018-07-09 21:57:51 +01:00
Richard Davey
f892d97475 Removed indexCount 2018-07-09 17:06:36 +01:00
Richard Davey
2d313ac927 The start of adding multi-line alignment 2018-07-09 17:06:20 +01:00
Richard Davey
f266acecc2 Re-uses the bounds object, rather than re-creating constantly. 2018-07-09 17:06:06 +01:00
Richard Davey
a16a7457bc Now stores the line data in the bounds object. 2018-07-09 17:05:53 +01:00
Richard Davey
a3803a286f Fixed origin addition post-scale 2018-07-09 16:17:52 +01:00
Richard Davey
91a48c30c4 GetBitmapTextSize, which is used internally in the BitmapText Game Objects, will now produce different bounds from the previous version. Previously, the bounds were tight against the letters in the text. However, this meant the bounds were not properly aligned with the origin of the BitmapText, and consequently you'd get different bounds if the text consisted of different characters. The bounds are now calculated purely based on the glyph data and letter spacing values. This will give a far more consistent overall experience, but it does mean if you were using the bounds to position text previously, you'll need to revisit that code again. See issue #3799 for more details (and to discuss this further if you wish) 2018-07-09 16:06:36 +01:00
Richard Davey
84c7960a48 The Quad Game Object now has a new setFrame method that allows you to change the frame being rendered by the Quad, including using frames that are part of a texture atlas. Fix #3161 2018-07-09 13:42:33 +01:00
Richard Davey
ecd99869bd Explained mask positioning better in docs. Fix #3770 2018-07-08 23:38:13 +01:00
Richard Davey
9e84c9f082 Fixed slice method 2018-07-08 22:44:40 +01:00
Richard Davey
5c554f3f69 Started moving dynamic bitmap text renderer to its own function 2018-07-07 12:34:24 +01:00
Richard Davey
dd0490dd57 Removed batchBitmapText, tidied up and moved to its own renderer 2018-07-07 12:22:45 +01:00
Richard Davey
8b13631107 Removed batchMesh and moved to the Mesh WebGL Renderer. Another one bites the dust. 2018-07-06 19:35:46 +01:00
Richard Davey
0428ecc430 Mesh now supports the tintFill property 2018-07-06 19:35:14 +01:00
Richard Davey
4fb63fd405 Clairty over obscurity 2018-07-06 19:35:01 +01:00
Richard Davey
6aa1526ea9 Graphics.arc has a new optional argument overshoot. This is a small value that is added onto the end of the endAngle and allows you to extend the arc further than the default 360 degrees. You may wish to do this if you're trying to draw an arc with an especially thick line stroke, to ensure there are no gaps. Fix #3798 2018-07-06 17:15:46 +01:00
Richard Davey
a64d747c98 clearMask(true) would throw an exception if the Game Object didn't have a mask. Now it checks first before destroying the mask. Fix #3809 2018-07-06 16:34:11 +01:00
Richard Davey
1931716da3 Exposed isTinted bool 2018-07-06 16:22:42 +01:00
Richard Davey
45208202ae Added canvas props 2018-07-06 15:55:05 +01:00
Richard Davey
901a75d053 setCrop will accept numbers or a Rectangle object 2018-07-06 12:57:42 +01:00
Richard Davey
f3a446797d Added new TextureCrop component 2018-07-05 13:06:28 +01:00
Richard Davey
43fc988034 Moved crop UV handler to the Frame method. Cleaner and easier. 2018-07-04 15:18:08 +01:00
Richard Davey
ee8c1b403a Fixed cropping with flipped images 2018-07-04 14:50:26 +01:00
Richard Davey
744e161d22 Added setCrop support 2018-07-03 16:48:01 +01:00
Richard Davey
afec945c94 Pass in the UV values 2018-07-02 23:52:00 +01:00
Richard Davey
89bf09d19d Swapped to unified batchVertices method 2018-07-02 17:06:34 +01:00
Richard Davey
d3df3436e4 Blitter now hits the renderer directly 2018-07-02 16:44:09 +01:00
Richard Davey
f57ecc0d81 Moved method 2018-07-02 16:43:43 +01:00
Richard Davey
cf008e612c Added e and f properties and multiplyWithOffset and copyFrom 2018-07-02 15:33:54 +01:00
Richard Davey
ea53e832c2 Added tintEffect property 2018-07-02 13:33:15 +01:00
Richard Davey
5fdf51ce59 Using direct pipeline calls 2018-07-02 13:32:56 +01:00
Richard Davey
0ac0bc18d3 Set tint on setters 2018-07-02 13:32:27 +01:00
Richard Davey
52b24e2879 Added tintFill property and more detailed documentation 2018-06-30 11:33:06 +01:00
Richard Davey
f97ce72e16 Added the Mask compontent to Container. It worked without it, but this brings it in-line with the documentation and other Game Objects. Fix #3797 2018-06-28 14:17:04 +01:00
Richard Davey
217779604c Added tileScaleX and tileScaleY support for Tile Sprites 2018-06-28 12:59:27 +01:00
Richard Davey
7a23378015 Unified use of roundPixels, antialias and pixelArt modes 2018-06-27 15:15:00 +01:00
Richard Davey
d02d6532fd TileSprite was using the Size compontent instead of ComputedSize, meaning its getBounds and displayWidth and displayHeight results were incorrect. Fix #3789 2018-06-27 11:20:21 +01:00
Richard Davey
7aa46657c2 Tidying up jsdocs and changing float to number 2018-06-26 23:19:14 +01:00
Richard Davey
8391042ff9
Merge pull request #3783 from samme/feature/particle-emitter-stop
Add ParticleEmitter#stop()
2018-06-25 22:42:00 +01:00
Richard Davey
8af70d02d1
Merge pull request #3780 from TadejZupancic/patch-9
disableInteractive
2018-06-25 22:39:54 +01:00
Richard Davey
51468fdefc Merge branch 'master' of https://github.com/photonstorm/phaser 2018-06-25 16:25:42 +01:00
Richard Davey
90ba2608fa Added in Camera alpha support to all canvas renderers 2018-06-25 16:24:08 +01:00
Richard Davey
bcacfeb87c Bob.alpha was ignored by the canvas renderer, only working in WebGL. This has now been fixed. 2018-06-25 15:59:01 +01:00
Richard Davey
9a96785cf6 If the Blitter object has no Bob's to render it will now abort immediately, avoiding several context calls in Canvas mode. 2018-06-25 15:38:06 +01:00
samme
bc2212c87d Add ParticleEmitter#stop() 2018-06-23 12:51:16 -07:00
Richard Davey
5a0fe89a7e Swap _id to id 2018-06-23 12:26:39 +01:00
Chris Andrew
c2bfc52987 Documented the majority of the Geom Line functions. 2018-06-21 18:13:56 +01:00
Chris Andrew
6854ccb764 Cleaned up some remaining GameObject descriptions. 2018-06-21 14:18:28 +01:00
Chris Andrew
978f982c26 Documented the remaining ParticleEmitter Zone classes. 2018-06-21 14:12:47 +01:00
Chris Andrew
4b5ab4e217 Documented most of the remaining PathFollower descriptions. 2018-06-21 13:19:52 +01:00
TadejZupancic
5859979c96
Update GameObject.js 2018-06-21 14:07:18 +02:00
Chris Andrew
df88218534 Finished up EmitterOp method descriptions.
Finally!
2018-06-21 12:47:29 +01:00
Richard Davey
2c8c4c7a16 Bob.setFrame didn't actually set the frame on the Bob, now it does. Fix #3774 2018-06-20 19:33:59 +01:00
Chris Andrew
7f232b6bed Further EmitterOp documentation. 2018-06-20 17:18:03 +01:00
Chris Andrew
584e8f9919 Started documenting the EmitterOp class. 2018-06-20 16:18:00 +01:00
Chris Andrew
d6a13eb8db Finished up TileSprite property descriptions, started on its class description. 2018-06-20 08:33:55 +01:00
Chris Andrew
9f23818c40 Documented various missing descriptions for GameObject classes and functions. 2018-06-20 07:28:02 +01:00
Richard Davey
b832247a35 Merge branch 'master' of https://github.com/photonstorm/phaser 2018-06-19 14:14:40 +01:00
Richard Davey
f1fe131e56 Tidying up Render Texture to make it more useful 2018-06-19 14:14:37 +01:00
Richard Davey
3a6f093579
Merge pull request #3761 from DannyT/fix/buildgameobjectanimation
Fix setter calls in BuildGameObjectAnimation
2018-06-19 13:22:13 +01:00
Richard Davey
30276cd4c2
Merge pull request #3765 from DrevanTonder/master
change ParticleEmitter.startFollow to fix issue 3764
2018-06-19 13:20:19 +01:00
Richard Davey
622fd7c34a
Merge pull request #3745 from cyantree/feature/update-graphics-jsdoc
Changed options and sub options of `Graphics` constructor in docs to …
2018-06-19 13:19:12 +01:00
Richard Davey
62661b46fb Updated rounded rect functions 2018-06-19 13:17:38 +01:00
Richard Davey
cc5f1bb91e
Merge pull request #3755 from TadejZupancic/patch-8
Add rounded rectangle to Graphics
2018-06-19 12:47:58 +01:00
Richard Davey
95f923bcad
Merge pull request #3762 from dvdbrink/patch-1
Fix GameObject typings when returning itself
2018-06-19 12:30:57 +01:00
TadejZupancic
c1d0c11b30
Update Graphics.js 2018-06-18 10:52:49 +02:00
Andre van Tonder
b2f8a139cc change ParticleEmitter.startFollow to fix issue 3764 2018-06-18 14:25:12 +08:00
Chris Andrew
a480232d87 Documented Graphics.save() and Graphics.restore().
Adapted from Mozilla's descriptions of the corresponding Canvas methods.
2018-06-17 19:43:05 +01:00
Daniel van den Brink
9a2c110c44
Fix GameObject typings for returning this 2018-06-17 08:54:28 +02:00
DannyT
1eb60e09a3 changed animation api calls to include updated set verb (e.g. .setDelay() vs .delay()) 2018-06-16 18:15:29 +01:00
TadejZupancic
caef54a34e
Update Graphics.js 2018-06-15 14:36:24 +02:00
TadejZupancic
321aba14c3
Update Graphics.js 2018-06-15 14:31:44 +02:00
TadejZupancic
9affc60037
Update Graphics.js 2018-06-15 14:23:40 +02:00
Chris Andrew
47fdf779d3 Switched to example annotations for the setStyle() examples. 2018-06-14 14:49:29 +01:00
Chris Andrew
885b404b98 Fixed the indentation of setStyle() examples. 2018-06-14 14:41:17 +01:00
Chris Andrew
a6b8b8ed31 Documented the Text game object and its TextStyle companion.
Minor update to JSON representation descriptions.
2018-06-14 14:27:58 +01:00
cyantree
a727437304 Changed options and sub options of Graphics constructor in docs to be optional 2018-06-13 20:01:26 +02:00
Chris Andrew
468b61da6f Tweaked the LightsPlugin example in its class description. 2018-06-13 18:56:57 +01:00
Chris Andrew
124b0ff773 Documented Light, LightsManager and LightsPlugin.
Documented class description for TransformMatrix.

Added a missing description from Container's EachContainerCallback.
2018-06-13 18:44:32 +01:00
Chris Andrew
566fdaca0e Documented the TransformMatrix component. 2018-06-13 14:36:07 +01:00
Chris Andrew
eb84ad58df Documented the MatrixStack component. 2018-06-13 13:48:33 +01:00
Richard Davey
15b544fc46 jsdoc fixes 2018-06-13 08:37:40 +01:00
Richard Davey
9d52b6ac91 Fixed jsdoc errors 2018-06-12 17:05:39 +01:00
TadejZupancic
3c96ca73ec
Update Zone.js 2018-06-12 15:49:02 +02:00
Richard Davey
5c7e624260 setInteractive will now take a configuration object as the only argument, allowing for easier setting of more complex input values 2018-06-11 11:35:31 +01:00
Chris Andrew
c08dde33b1 Documented some remaining TileSprite descriptions. 2018-06-08 17:07:35 +01:00
Chris Andrew
469c34feee Documented the remaining descriptions in the Quad and Sprite game objects. 2018-06-08 15:50:44 +01:00
Chris Andrew
ae214a8664 Documented the missing descriptions for the Mesh game object. 2018-06-08 15:42:55 +01:00
Chris Andrew
07e9878166 Documented the Light game object. 2018-06-08 15:40:39 +01:00
Chris Andrew
f8ee35d46a Fixed Gamepad lint errors, tweaked some Graphics docs. 2018-06-07 18:36:27 +01:00
Chris Andrew
62d6496dfb Adapted Graphics class description from Phaser CE.
Documented the remaining properties and a few more methods.
2018-06-07 16:47:27 +01:00
Chris Andrew
786d2068a3 Documented most of the Graphics Game Object methods. 2018-06-07 16:01:40 +01:00
Chris Andrew
69ec32a2fe Documented initial Graphics options and Graphics style settings types. 2018-06-07 16:01:40 +01:00
Chris Andrew
ab5853f65e Started documenting the Graphics game object.
Added a couple of missing descriptions for the Container game object.
2018-06-06 17:52:31 +01:00
Chris Andrew
39ace6c9e9 Finished all BitmapText descriptions, other than GameObject class descriptions. 2018-06-06 17:34:18 +01:00
Chris Andrew
fb33fd045d Documented DynamicBitmapText display callbacks.
Finished up some DynamicBitmapText related descriptions.

Removed the align property from BitmapTextConfig, as it's not used.
2018-06-06 17:26:55 +01:00
Chris Andrew
79c3242c68 Tweaked and filled in a few more BitmapText related descriptions. 2018-06-06 16:58:48 +01:00
Chris Andrew
c9d4ff9f83 Fixed case of @readOnly annotations in BitmapText and DynamicBitmapText. 2018-06-06 16:34:49 +01:00
Chris Andrew
96d750bb60 Documented BitmapText and DynamicBitmapText.
Moved BitmapFontData typedefs to the BitmapText class file.
2018-06-06 16:32:58 +01:00
Chris Andrew
25f1dedb74 Started documenting Bitmap Font data structures. 2018-06-06 15:12:12 +01:00
Chris Andrew
a90e78d0a9 Finished UpdateList and RetroFont.Config documentation. 2018-06-06 15:11:40 +01:00
Chris Andrew
4aaf071ad3 Cleaned up some previous documentation, finished the RenderTexture GameObject documentation. 2018-06-06 14:23:39 +01:00
Richard Davey
c0ac1259ea Significant Data Manager overhaul.
Adds in values property, removes redundant functions, streamlines the event flow, adds features to the get and set handlers.
2018-06-05 01:01:13 +01:00
Richard Davey
a67e5dbbd5
Merge pull request #3726 from samme/feature/updatelist-length
Add Phaser.GameObjects.UpdateList#length
2018-06-03 21:01:07 +01:00
samme
5be5ea8024 Add Phaser.GameObjects.UpdateList#length 2018-06-02 20:59:01 -07:00
Chris Andrew
9e49b30d31 Fixed @return annotation spacing for GetBitmapTextSize. 2018-06-01 15:32:03 +01:00
Chris Andrew
085efa3190 Fixed a couple of BitmapTextSize descriptions. 2018-06-01 15:28:00 +01:00
Chris Andrew
8a7f381a28 Improved some GetBitmapTextSize descriptions. 2018-06-01 15:25:16 +01:00
Chris Andrew
efaff363aa Documented XML Bitmap Font parsing and the GetBitmapTextSize function. 2018-06-01 15:21:10 +01:00
Chris Andrew
4750e92be4 Fixed a method signature issue with the Animation component's 'remove' event handler.
This prevented removed animations from stopping correctly, when they were removed from the AnimationManager.
2018-06-01 14:37:15 +01:00
Chris Andrew
007ac01f10 Documented the Animation, Pipeline and ToJSON Game Object components. 2018-06-01 14:08:35 +01:00
Chris Andrew
cb6077f231 Documented most of the Animation component class and some of the Animation class. 2018-06-01 13:11:25 +01:00
Chris Andrew
544daa8d4a Documented the DisplayList and UpdateList plugins, and the BuildGameObject function. 2018-06-01 11:36:12 +01:00
Richard Davey
7df02a4447 Added 2 NOOPs instead of merging the whole mixins. 2018-06-01 00:03:45 +01:00
TadejZupancic
6f7463f4f7
Particle Emitter Manager in Container
Added Alpha and ScrollFactor Mixin to Particle Emitter Manager otherwise it crashes when added to the Container.
2018-05-30 10:44:49 +02:00
Richard Davey
a739be27a1 RenderTexture.resize will allow you to resize the underlying Render Texture to the new dimensions given. Doing this also clears the Render Texture at the same time 2018-05-29 12:07:40 +01:00
Richard Davey
a7da8dc28f The Canvas RenderTexture drawImage method incorrectly set the values of the frame, causing them to appear wrongly scaled in the canvas renderer. Fix #3710 2018-05-29 11:50:23 +01:00
Richard Davey
6ab124c591
Merge pull request #3687 from thomastanck/thomastanck-typedefupdates
Update type definitions
2018-05-24 13:49:30 +01:00
Richard Davey
30678b44ff Updated method names 2018-05-23 23:09:31 +01:00
Richard Davey
1a1dbe2dd7 lint fix 2018-05-23 14:55:51 +01:00
Richard Davey
457ab68ef4 Container updated to use preDestroy and remove event hooks 2018-05-22 16:02:28 +01:00
Richard Davey
d629923e54 Blitter preDestroy will now clear the children List and renderList. 2018-05-22 16:02:13 +01:00
Richard Davey
b3ef36ed08 Added preDestroy callback 2018-05-22 15:59:23 +01:00
Richard Davey
660887f338 Group.destroy now respects the ignoreDestroy property. 2018-05-22 15:59:10 +01:00
Richard Davey
2630c982b4 jsdoc fixes 2018-05-22 15:55:36 +01:00
Richard Davey
137f97b325 RenderTexture.destroy has been renamed to preDestroy to take advantage of the preDestroy callback system. 2018-05-22 15:55:22 +01:00
Richard Davey
0893c158d1 Added jsdocs 2018-05-22 15:55:02 +01:00
Richard Davey
126ec196c1 TileSprite.destroy has been renamed to preDestroy to take advantage of the preDestroy callback system. 2018-05-22 15:54:53 +01:00
Thomas Tan
0fcfe73de1
Missed some cases 2018-05-22 16:08:44 +08:00
Thomas Tan
2c5cadc67c
Use this return type annotation 2018-05-22 12:46:26 +08:00
Thomas Tan
0fa334ff3e
Change Group.* return types from GameObject to any 2018-05-22 12:05:52 +08:00
Richard Davey
7c28a7bd08 Bob.reset will now reset the position, frame, flip, visible and alpha values of the Bob, plus JSDocs completed. 2018-05-18 14:44:25 +01:00
Richard Davey
9429a28574 The Particle tint value was incorrectly calculated, causing the color channels to be inversed. Fix #3643 2018-05-18 13:16:17 +01:00
Richard Davey
0d0846a415 Calling a creator, such as GraphicsCreator, without passing in a config object, would cause an error to be thrown. All Game Object creators now catch against this. 2018-05-16 15:17:08 +01:00
Richard Davey
984c90f0bc
Merge pull request #3659 from samme/fix/typescript-body
Correct JSDoc type for GameObject#body
2018-05-15 16:27:20 +01:00
Richard Davey
26faa58ad7 Corrected an error in Container.getBoundsTransformMatrix that called a missing method, causing a getBounds on a nested container to fail. Fix #3624 2018-05-15 16:23:33 +01:00
samme
0bbffdc965 Correct JSDoc type for GameObject#body 2018-05-15 08:04:44 -07:00
Richard Davey
5b0cb0faf3 All Game Objects have a new method setRandomPosition which will randomly position them anywhere within the defined area, or if no area is given, anywhere within the game size. 2018-05-15 15:58:53 +01:00
Richard Davey
350cb037b7 All systems now register themselves with the new PluginCache 2018-05-15 12:51:50 +01:00
Richard Davey
11cbf0cf8d Marked the children parameter as optional. Fix #3657 2018-05-10 23:32:46 +01:00
Richard Davey
be330e609e Moved PluginManager to new location 2018-05-10 17:14:33 +01:00
Richard Davey
672a535d88 Added disableInteractive and removeInteractive methods. #3621 2018-05-08 16:15:50 +01:00
Richard Davey
107ca71d6b BitmapText, both static and dynamic, can now take any data-type, including numbers, for the text argument in the constructor. Before they only worked via setText 2018-05-03 15:52:12 +01:00
Richard Davey
c13c828dc4 lint fix 2018-05-02 11:36:03 +01:00
Richard Davey
28251fd0f5 addToScene added to all Game Object Creators 2018-05-02 10:57:26 +01:00
Richard Davey
a30d5acb9e The Graphics Creator would automatically add the Graphics to the display list by mistake. The default should be to remain hidden. Fix #3637 2018-05-02 10:57:04 +01:00
Richard Davey
661ed5f675
Merge pull request #3629 from samme/fix/setEmitZone
Fix `source` checks in ParticleEmitter#setEmitZone
2018-05-01 11:38:52 +01:00
Richard Davey
3323b785b2 space-infix fix 2018-04-30 13:03:44 +01:00
Richard Davey
63dbd9fd12 The Animation Component setProgress method was setting the frame on the wrong object. Fix #3633 2018-04-30 12:37:50 +01:00
Richard Davey
373ebe7d3f Merge branch 'master' of https://github.com/photonstorm/phaser 2018-04-30 12:28:36 +01:00
Richard Davey
9fa74400ab Container.getBounds now checks if it can call getBounds on its children before doing so, as some do not have this method (such as Graphics objects) so they no longer cause the call to crash. Fix #3623 2018-04-30 12:28:26 +01:00
samme
5fc6f94c67 Remove source checks in setEmitZone 2018-04-28 13:10:22 -07:00
samme
f59f90d2ca Correct source types in *ZoneConfig definitions 2018-04-28 13:09:59 -07:00
samme
84ba1ba191 Correct source checks in setEmitZone 2018-04-28 08:41:32 -07:00
Rex
0a46d64328 Remove extra space in each line end
Add space only when the word index is greater than last one.
2018-04-28 14:54:59 +08:00
Richard Davey
2037cf468b More clarity. #3622 2018-04-27 12:42:37 +01:00
Richard Davey
b2b631534c
Merge pull request #3616 from samme/fix/particles
Fix ParticleEmitter#toJSON() output
2018-04-26 13:03:30 +01:00
samme
bd9831912c Don't stringify emitter ops twice 2018-04-24 14:20:23 -07:00
samme
0de5340201 Add 'angle' to configOpMap
It was missing from toJSON() output
2018-04-24 14:20:23 -07:00
samme
66f1ff848e Fix no children created from GroupCreateConfig[] (multiple adds)
Fixes #3612
2018-04-23 18:14:36 -07:00
Richard Davey
6d958c5157 jsdoc udpate 2018-04-23 23:39:24 +01:00
Richard Davey
e3c28d3cd9 Removed un-needed arguments 2018-04-23 17:28:37 +01:00
Richard Davey
ed2eafb3b3 Code tidying 2018-04-23 00:13:11 +01:00
Richard Davey
ced2d34b34 BitmapMask and GeometryMask both have new destroy methods which clear their references, freeing them for gc. 2018-04-23 00:13:04 +01:00
Richard Davey
30a0ff02cb
Merge pull request #3600 from samme/docs/particles
Add docs for gameobjects/particles
2018-04-22 23:07:51 +01:00
Richard Davey
f34a507002
Merge pull request #3605 from zilbuz/master
Update GetBounds.getBounds() JSDoc
2018-04-22 23:06:25 +01:00
samme
711d2a6193 Minor additions and corrections to docs 2018-04-20 21:00:19 -07:00
Richard Davey
606ba6d8d7 Added new Mask component and added to all relevant Game Objects 2018-04-20 18:57:49 +01:00
Basile Desloges
a7fc306329 Update GetBounds.getBounds() JSDoc so that @generic matches with @param and @return 2018-04-20 17:55:32 +02:00
samme
8b939d7790 Omit EmitterOpEmitConfig, EmitterOpUpdateConfig 2018-04-20 06:51:31 -07:00
Richard Davey
6299019838 Updated to use typeof DefinePlugin check. 2018-04-20 00:23:24 +01:00
samme
0b881e9a4e Add particles docs 2018-04-19 14:05:21 -07:00
Richard Davey
349a95bc4b Updating to 3.6.0 2018-04-19 14:45:45 +01:00
Richard Davey
cfc4528370 Containers no longer in beta. 2018-04-19 14:35:17 +01:00
Richard Davey
3d0be3e20c Group.remove and clear have optional destroyChild arguments 2018-04-19 14:13:46 +01:00
Richard Davey
e14d0c5054 eslint fixes 2018-04-19 13:57:33 +01:00
Richard Davey
cb4eb9e435 Rescoped RetroFont so it's no longer bound to BitmapText 2018-04-19 13:07:59 +01:00
Richard Davey
5b31a51dd5 Rescoped 2018-04-19 12:42:35 +01:00
Richard Davey
32ce8d7947 jsdoc fixes and removed un-used ResetKey file. 2018-04-19 12:30:38 +01:00
Felipe Alfonso
4496e773a7 Removed particle scroll factor property and calculation from canvas rendering 2018-04-18 18:44:09 -03:00
samme
1c0905a103 Fix incorrect active state selection 2018-04-18 08:44:10 -07:00
Richard Davey
23f353326c jsdoc fix 2018-04-18 13:48:25 +01:00
Richard Davey
6e77557375 jsdoc fixes 2018-04-18 13:34:22 +01:00
Richard Davey
b0544c73b8 jsdoc fixes 2018-04-18 13:29:22 +01:00
Richard Davey
d96382f94d Added getFirstNth and getLastNth 2018-04-18 13:28:57 +01:00
Richard Davey
55965c748f jsdoc fixes 2018-04-18 12:13:49 +01:00
Richard Davey
5b4feedcaf Added Group.GetLast 2018-04-18 04:01:06 +01:00
Richard Davey
1be486fab4 destroy only called once, no matter how many times the Scene restarts. Fix #3581 2018-04-17 12:25:45 +01:00
Richard Davey
348aeec4ec
Merge pull request #3580 from jmcriat/patch-1
Delete Texture only applicable on renderer.gl
2018-04-17 02:36:17 +01:00
Richard Davey
07a55e5d1f Removed debug call and merged Scene Systems boot and start sequences. Fix #3579 2018-04-17 02:34:07 +01:00
José Maria
607ce3a9bb
Delete Texture only applicable on render.gl
There is no deleteTexture on this.renderer when running on canvas.
 Destroying tilesprite (scene shutting down) would throw error.
2018-04-16 21:50:04 -03:00
Richard Davey
28e2764723 More jsdoc fixes 2018-04-16 16:02:27 +01:00
Richard Davey
b392dee5a9 More jsdoc fixes 2018-04-16 15:11:51 +01:00
Richard Davey
18585de81d Lots of jsdoc fixes 2018-04-16 14:43:24 +01:00
samme
821fff02b5 Group fixes/changes:
- remove() rejects non-members
- createMultiple() stops creating objects if the Group becomes full
- isFull() returns true if the group size *exceeds* maxSize
- Group() calls createMultiple() only if config.key was passed
2018-04-15 10:38:50 -07:00
Richard Davey
ce7d67297f Moving from 3.4.1 to 3.5.0 so we can release new camera fx and scene transitions 2018-04-15 12:44:47 +01:00
Richard Davey
855f38c649 typo 2018-04-14 17:38:20 +01:00
Felipe Alfonso
1058cff4c8 Fixed issue with inverted coordinates on render texture 2018-04-13 17:33:43 -03:00
Richard Davey
a01535ea78 Group.add and Group.addMultiple now respect the Group.maxSize property, stopping you from over-populating a Group. 2018-04-13 17:59:29 +01:00
Richard Davey
0aba433379 Merge branch 'master' of https://github.com/photonstorm/phaser 2018-04-13 17:20:51 +01:00
Richard Davey
59bc9dd0d9 Added GameObject.ignoreDestroy 2018-04-13 17:20:46 +01:00
Richard Davey
6b2307594a Scene plugin flow overhaul
Every Plugin has been updated to correctly follow the same flow through the Scene lifecycle. Instead of listening for the Scene 'boot' event, which is only dispatched once (when the Scene is first created), they will now listen for the Scene 'start' event, which occurs every time the Scene is started. All plugins now consistently follow the same Shutdown and Destroy patterns too, meaning they tidy-up after themselves on a shutdown, not just a destroy. Overall, this change means that there should be less issues when returning to previously closed Scenes, as the plugins will restart themselves properly.
2018-04-13 17:12:17 +01:00
Felipe Alfonso
d3beb043e2 Added parent to game objects that called CanvasPool.create2D 2018-04-13 12:48:34 -03:00
Richard Davey
52fcf7e7c1
Merge pull request #3557 from Antriel/master
Fix Animation component update()
2018-04-13 12:14:21 +01:00
Richard Davey
8000f9298d
Merge pull request #3554 from samme/docs/group
Add descriptions for Phaser.GameObjects.Group
2018-04-13 12:12:01 +01:00
Antriel
6be6f17bfd Add missing letterSpacing to DynamicBitmapText 2018-04-13 10:50:18 +02:00
Antriel
b52707f79d Fix Animation component pause() 2018-04-13 09:58:33 +02:00
samme
470d2bc08a Add descriptions for Phaser.GameObjects.Group 2018-04-12 20:10:03 -07:00
Richard Davey
a6ef9e09dd Shorter warning 2018-04-12 23:12:23 +01:00
Richard Davey
703f04025b Added warning to docs 2018-04-12 22:49:02 +01:00
Richard Davey
5612336d47 Containers flag 2018-04-12 22:46:46 +01:00
Richard Davey
1802f8b30b GetBounds getTopLeft, getTopRight, getBottomLeft and getBottomRight all have a new optional argument includeParent which will factor in all ancestor transforms to the returned point. 2018-04-12 17:42:16 +01:00
Richard Davey
9269aa7a73 Swapped to using public properties 2018-04-12 16:28:05 +01:00
Richard Davey
f13bbca9c3 Fix getWorldBounds clash 2018-04-12 14:25:46 +01:00
Richard Davey
c57112414a eslint override 2018-04-12 02:18:01 +01:00
Richard Davey
9c0c037d79 Added getIndexList method. 2018-04-12 02:11:17 +01:00
Richard Davey
38626f8556 Added originX/Y properties. Fix #3545 2018-04-11 21:07:41 +01:00
Richard Davey
223c94a783 Merge branch 'master' of https://github.com/photonstorm/phaser 2018-04-11 16:58:52 +01:00
Richard Davey
0e14b43623 Added maxSize, jsdocs and ts def fixes 2018-04-11 16:58:48 +01:00
Felipe Alfonso
5e2699f1a4 Merge branch 'master' of https://github.com/photonstorm/phaser 2018-04-11 12:55:54 -03:00
Felipe Alfonso
23cd9868b4 Added getWorldTransformMatrix to Container and added support to parent container transform to GetBounds component. 2018-04-11 12:55:32 -03:00
Richard Davey
a1e10a4bbc Added missing extends and removed setSF because defaults are 1,1 anyway 2018-04-11 15:39:30 +01:00
Felipe Alfonso
091d947eae Container scroll factor implemented to the render functions 2018-04-11 11:02:04 -03:00
Richard Davey
30d73a0197 Container can now be assigned an arcade physics body 2018-04-11 13:37:38 +01:00
Richard Davey
276ae03aff TODO 2018-04-11 13:17:42 +01:00