Commit graph

1475 commits

Author SHA1 Message Date
Richard Davey
f751d4066a Added Math.FromPercent function 2017-10-17 21:31:28 +01:00
Richard Davey
d279e77910 Moving to new folder 2017-10-17 04:19:42 +01:00
Richard Davey
d49d7b10c2 Particle Emitter Manager looks after all emitters bound to it 2017-10-17 04:19:29 +01:00
Richard Davey
4ac80bde34 New Particle Manager renderer functions 2017-10-17 04:19:03 +01:00
Richard Davey
66fc40845b Defaults y to x if not given 2017-10-17 04:18:29 +01:00
Richard Davey
6accb89ff0 The emitter can now set the blend mode and render target directly, also includes scrollFactor now 2017-10-17 04:18:05 +01:00
Richard Davey
6770113aa0 Added SKIP_CHECK blend mode const and moved setBlendMode to handle it in the main loop 2017-10-17 04:17:28 +01:00
Richard Davey
daf8216369 Added new SKIP_CHECK blend mode 2017-10-17 04:17:04 +01:00
Richard Davey
e633e9d407 Particle Emitter has its own blend mode, render target and visibility.
The emitter also now looks after its own particles and is a child of a Particle Manager.
2017-10-17 04:16:52 +01:00
Richard Davey
44b076fab8 Particle now has a frame component 2017-10-17 04:16:08 +01:00
Richard Davey
c7d08a3652 Moved to the Particles folder 2017-10-17 04:15:53 +01:00
Richard Davey
e6dfa1da73 Removed object check in 'set' and added y argument default to x 2017-10-16 22:57:28 +01:00
Richard Davey
9c5e257598 Added Frame halfWidth and halfHeight properties 2017-10-16 22:16:33 +01:00
Richard Davey
90e6637be3 Particle Renderers now bail out early if emitter is empty 2017-10-16 22:16:13 +01:00
Richard Davey
a98b3544c7 Updated WebGL particle renderer to allow particles to have unique frames (within the same texture) 2017-10-16 22:15:51 +01:00
Richard Davey
898e445a3b Updated build 2017-10-16 12:43:09 +01:00
Richard Davey
498e1215f5 JSDoc blocks added. 2017-10-13 17:08:19 +01:00
Richard Davey
b28962e442 Split Curve up into includes and tidied up the namespace so it all now lives under Phaser.Curves. 2017-10-13 16:39:41 +01:00
Richard Davey
1882ee82ce Split Path up into includes. 2017-10-13 14:56:47 +01:00
Richard Davey
23f201660d JSDocs added. 2017-10-13 14:11:54 +01:00
Richard Davey
c22668d53d JSDoc blocks added. 2017-10-13 12:12:59 +01:00
Richard Davey
60d9133d05 Renamed from Frame to AnimationFrame and moved folder. 2017-10-13 11:56:52 +01:00
Richard Davey
ed4cc550e8 JSDoc blocks added. 2017-10-13 11:56:39 +01:00
Richard Davey
c9aefdaca1 Updated folder to match the namespace. 2017-10-13 11:38:34 +01:00
Pavle Goloskokovic
29faabd48a Merge branch 'master' of https://github.com/photonstorm/phaser 2017-10-12 18:19:26 +02:00
Pavle Goloskokovic
1a30fc0758 updated docs and params names for newly added static methods 2017-10-12 18:13:40 +02:00
Pavle Goloskokovic
10eaa46ffa using new static methods for generating object url when loading html files as well 2017-10-12 18:10:58 +02:00
Richard Davey
a82777461f JSDoc blocks added. 2017-10-12 15:50:03 +01:00
Pavle Goloskokovic
a0c1d129ce moved url generating logic into File class static methods
applied it to image and svg file classes
fixed issue with unnecessary calls to revokeObjectURL method in SVGFile class
2017-10-12 16:20:42 +02:00
Richard Davey
c6d8423338 Renaming folder to match namespace. 2017-10-12 15:14:34 +01:00
Richard Davey
e5b35c0cf5 JSDocs added. 2017-10-12 15:09:52 +01:00
Pavle Goloskokovic
a7cf674323 added alternative image loading with FileReader when URL API is not available 2017-10-12 15:39:36 +02:00
Richard Davey
8ddef7aab9 Added jsdocs. 2017-10-12 13:57:55 +01:00
Richard Davey
876d885167 jsdoc blocks added. 2017-10-12 13:12:52 +01:00
Richard Davey
069cbe9e62 Splitting up ready for jsdocs. 2017-10-12 12:47:20 +01:00
Richard Davey
7b46b2a3a9 Added missing returns 2017-10-12 01:32:08 +01:00
Richard Davey
bdbf2a1f96 Adding jsdocs 2017-10-12 01:24:01 +01:00
Richard Davey
4ea560cb34 Tidying up the module names 2017-10-12 01:05:16 +01:00
Richard Davey
0ae15f1a36 Added sloc package. 2017-10-11 17:06:21 +01:00
Richard Davey
8cf60b4c3e Tidying-up the namespace. 2017-10-11 17:06:13 +01:00
Pavle Goloskokovic
a0694bc368 removing URL polyfill 2017-10-11 17:10:02 +02:00
Richard Davey
51a5193999 Removed un-used methods. 2017-10-11 12:37:11 +01:00
Richard Davey
3a096bc7ec Added window.URL polyfill.
fix #3069
2017-10-11 12:11:32 +01:00
Richard Davey
8e0c4ad6d8 Fixed updateOrigin method.
fix #3068
2017-10-11 12:05:09 +01:00
Richard Davey
39140d28bf Small bounds tweak 2017-10-10 00:38:05 +01:00
Richard Davey
9438870600 Tidying up for Beta 6 release. 2017-10-09 11:27:20 +01:00
Richard Davey
fa85f43d2e displayOriginX and displayOriginY are now getters / setters that will protect the actual values 2017-10-08 23:15:56 +01:00
Richard Davey
583a6459d3 setDisplayOrigin divide by zero fix #3066 2017-10-08 22:47:33 +01:00
Richard Davey
f03a829cfd Fixed setPoll method names 2017-10-08 22:38:32 +01:00
Richard Davey
4c075c9fe9 Fixed init functions. 2017-10-06 18:42:53 +01:00
Richard Davey
1f967ae72b More JSDocs added. 2017-10-06 06:16:31 +01:00
Richard Davey
ea94059b65 Lots more jsdoc blocks added. 2017-10-06 04:52:41 +01:00
Richard Davey
a5f306f5f5 Adding jsdoc blocks. 2017-10-06 03:05:01 +01:00
Richard Davey
8230f3f086 Circle docs and formatting return values 2017-10-05 00:58:42 +01:00
Richard Davey
7c9a5b41c7 Adding jsdocs 2017-10-05 00:09:12 +01:00
Richard Davey
bb97421214 Adding in method and property docs 2017-10-04 23:48:16 +01:00
Richard Davey
ae45affc9f More JSDocs work - this time to massive game config! 2017-10-04 19:59:08 +01:00
Richard Davey
99954c58fa Added callback scope argument to Set.each and Set.iterate. 2017-10-04 17:05:44 +01:00
Richard Davey
b3c40f51c0 Adding JSDoc blocks. 2017-10-04 17:05:26 +01:00
Richard Davey
d3f8d2d86d Use local Map, not ES6 map 2017-10-03 18:37:47 +01:00
Richard Davey
23e8141796 Can convert Objects into Colors 2017-10-03 00:53:06 +01:00
Richard Davey
0c5df6df80 Path can now be constructed via fromJSON. 2017-10-02 22:43:15 +01:00
Richard Davey
0e69dccabf Added fromJSON static method.
toJSON now uses local type property to avoid typos.
2017-10-02 22:42:47 +01:00
Richard Davey
d516cf6478 Curve.type property holds its const name. 2017-10-02 22:42:12 +01:00
Richard Davey
e15701da81 Added BaseLoader.save method.
Not really meant for production use, but super-handy for dev tools and prototypes.
2017-10-02 22:41:52 +01:00
Richard Davey
8b7bf81637 Re-parent the Bob class. 2017-10-02 14:50:02 +01:00
Richard Davey
17a89727f6 Beta 5 2017-10-02 12:05:30 +01:00
Richard Davey
b0c848fa3d Ack! 2017-09-29 19:52:25 +01:00
Richard Davey
a69e7a9b3f Added Curve.getDistancePoints 2017-09-29 18:55:03 +01:00
Richard Davey
017eb32dd9 GameObject.getBounds now factors in origin. 2017-09-29 18:54:51 +01:00
Richard Davey
f005380d67 Added Path.getBounds. 2017-09-29 17:27:53 +01:00
Richard Davey
832c17b7c5 Added accuracy argument to getBounds and made sure it wasn't > curve length. 2017-09-29 17:27:44 +01:00
Richard Davey
0726668db1 Moved Hermite out for now. 2017-09-29 16:38:04 +01:00
Richard Davey
416016e484 Added MoveTo curve construct for path jumping. 2017-09-29 15:27:47 +01:00
Richard Davey
966d0e491a Fixed splineTo. 2017-09-29 14:33:49 +01:00
Richard Davey
4713b1b07a Path.EllipseTo working :) 2017-09-29 14:16:04 +01:00
Richard Davey
b8b73691be Text cast to a string, avoids errors with creating Text using numbers. 2017-09-29 12:58:47 +01:00
Richard Davey
234ded04d4 Values returned as degrees. 2017-09-29 12:58:30 +01:00
Richard Davey
e28ddec761 Removed _startPoint to avoid double-updates in the setters.
Added in various chainable helpers, setXRadius, setWidth, etc.
2017-09-29 11:43:29 +01:00
Richard Davey
fb066fef04 Added Curve.getBounds support (and an override for LineCurve to make it faster). 2017-09-29 11:42:34 +01:00
Richard Davey
0ab6bc6677 Small docs reminder. 2017-09-29 11:42:14 +01:00
Richard Davey
865264b1b5 eslint fix. 2017-09-29 11:42:05 +01:00
Richard Davey
73b570fe63 Fixed error in addPoints method. 2017-09-29 11:41:49 +01:00
Richard Davey
d50aeb0039 Added getData and setData for better chaining and consistency. 2017-09-29 11:41:10 +01:00
Richard Davey
900e996671 Rectangle.FromPoints will create a rectangle based on the extends in the given array of points or point-like objects. 2017-09-29 11:40:49 +01:00
Richard Davey
2d852aab02 Fixed missing new. 2017-09-29 11:40:20 +01:00
Richard Davey
6431d99908 Added ability to set dragStart, drag and dragEnd callbacks. 2017-09-29 11:40:11 +01:00
Richard Davey
386e5f6ae2 Removed SetupCallbacks and merged with CreateSceneFromObject as its the only method to use it.
Updated CreateSceneFromObject to make it smaller and also now will copy across extra properties and functions defined in the 'extend' block.
2017-09-29 11:39:31 +01:00
Felipe Alfonso
bc281871ac - Particle Emitter canvas renderer
- Camera Effects resets blend mode to avoid bug when dealing with custom blended game objects
2017-09-28 22:16:10 -03:00
Richard Davey
9e8d2394bd Sorted out the rotateToPath settings 2017-09-28 01:00:42 +01:00
Richard Davey
f66fe89122 Tidying up the Follower class and adding in proxies. 2017-09-27 22:15:14 +01:00
Richard Davey
9ea20705a2 Spline.addPoints method will take multi-format data types 2017-09-27 22:14:59 +01:00
Richard Davey
cfec61f2e5 Added Tween.isPaused method 2017-09-27 22:14:39 +01:00
Igor Petushkov
31c38ad942 fix KeyCombo [TypeError: Cannot read property 'on' of undefined] 2017-09-27 19:04:39 +03:00
Richard Davey
aa78bf7367 Added rotate option. 2017-09-27 17:02:18 +01:00
Richard Davey
e3bd25a1f9 Tidying up 2017-09-27 02:56:37 +01:00
Richard Davey
347209af6c Merge branch 'master' of https://github.com/photonstorm/phaser 2017-09-27 02:32:42 +01:00
Richard Davey
84b74a13b6 PathFollower using a new number tween internally. 2017-09-27 02:32:39 +01:00
Richard Davey
76288f0b3a getStartPoint now accepts a vector to populate 2017-09-27 02:32:26 +01:00
Richard Davey
1b85e91785 Removed PathManager 2017-09-27 02:32:05 +01:00
Richard Davey
8be72cc9c0 Number Tweens added for purely numeric tweens when you don't want to have to create local objects 2017-09-27 02:31:52 +01:00
Richard Davey
df49b2d4af Tween.getValue added for NumberTweens 2017-09-27 02:31:28 +01:00
Felipe Alfonso
57bb413822 Work in progress anticlockwise arc 2017-09-26 20:29:42 -03:00
Richard Davey
a077abb8ce Testing with tween 2017-09-26 20:14:27 +01:00
Richard Davey
d86a6d21b1 Added PathFollower Game Object 2017-09-26 17:01:35 +01:00
Richard Davey
bd1154c7bf Both Curve and Path now expose getStartPoint and getEndPoint 2017-09-26 17:01:22 +01:00
Twilrom
7580288ddf Fix some typos in ParticleEmitter 2017-09-26 10:45:10 +02:00
Twilrom
b85c1774f2 Fix Sprite.play to have the same parameters as Sprite.anims.play 2017-09-26 10:45:04 +02:00
Richard Davey
b141ac468e Working through the Path Manager 2017-09-26 02:17:31 +01:00
Felipe Alfonso
302a568566 Added shape emission to particle emitter 2017-09-25 14:10:01 -03:00
Richard Davey
669f2e8350 Fixed callbacks not firing if an event nukes an interactive Game Object. 2017-09-25 16:06:16 +01:00
Richard Davey
757c9a0bbc Fixed typo. 2017-09-25 13:05:14 +01:00
Richard Davey
8861464ec1 PathFollower concept 2017-09-25 03:18:54 +01:00
Richard Davey
a534629980 Added toJSON functions to all Curve types and Path 2017-09-22 19:36:00 +01:00
Richard Davey
649fa88f24 Added Spline.addPoint. 2017-09-22 17:41:32 +01:00
Richard Davey
8a4fff945c Added getStartPoint and draw methods to all curves and paths. 2017-09-22 16:41:17 +01:00
Richard Davey
6631985a3e Preparing for beta 4. 2017-09-22 16:41:16 +01:00
Felipe Alfonso
32ec5615c8 Particle Emitter pause and resume 2017-09-22 12:36:24 -03:00
Felipe Alfonso
46ae7e848b Merge branch 'master' of https://github.com/photonstorm/phaser
# Conflicts:
#	v3/src/gameobjects/emitter/ParticleEmitter.js
2017-09-22 11:59:16 -03:00
Felipe Alfonso
a5d9d85f24 Explode on particle emitter 2017-09-22 11:44:03 -03:00
Richard Davey
a735709684 Removed backticks so it can build the dist file. 2017-09-22 12:07:07 +01:00
Richard Davey
34fa7b7059 Made set methods return Emitter instance for chaining. 2017-09-22 12:06:56 +01:00
Richard Davey
2d890ba775 Copy to examples now displays an error if it cannot find the examples repo locally. 2017-09-22 11:47:20 +01:00
Richard Davey
066ce233b8 Merge branch 'master' of https://github.com/photonstorm/phaser 2017-09-22 01:35:13 +01:00
Richard Davey
cf76bcf297 Added Path.addLineCurve to speed-up path creation 2017-09-22 01:35:10 +01:00
Richard Davey
c4f9c41c53 LineCurve can take an array of points now 2017-09-22 01:34:53 +01:00
Richard Davey
6bc39a82c2 More sensible property names 2017-09-22 01:34:39 +01:00
Richard Davey
ba2f351544 Added the consts back into Math 2017-09-22 01:34:30 +01:00
Felipe Alfonso
d595ad74a1 Fixed emitting angle 2017-09-21 19:26:00 -03:00
Felipe Alfonso
f76ac47696 Particle emitter with clear properties 2017-09-21 18:36:19 -03:00
Felipe Alfonso
43dd0a6adc Easing transtions for particles 2017-09-21 14:08:27 -03:00
Richard Davey
56e026e31b Start of the Path class. 2017-09-21 17:12:33 +01:00
Richard Davey
b399d3dc1e Added defaultDivsions property. 2017-09-21 17:12:26 +01:00
Richard Davey
3163a50d12 Added getResolution methods. 2017-09-21 17:12:16 +01:00
Richard Davey
3d09a834b7 Added Vector.equals methods. 2017-09-21 17:11:56 +01:00
Richard Davey
a89c6a872a Fixed undef var error. 2017-09-21 14:26:18 +01:00
Richard Davey
aaa90bae12 Tidied up the EllipseCurve arguments 2017-09-21 03:07:42 +01:00
Richard Davey
05d251a953 You cannot now overshoot the curve length in getUtoTmapping 2017-09-21 02:51:02 +01:00
Richard Davey
cf4b97cbdc Added SplineCurve 2017-09-21 02:31:11 +01:00
Richard Davey
b63c8ad135 Tidying up commented-out code 2017-09-21 02:31:04 +01:00
Richard Davey
98666739c2 Namespace fix 2017-09-21 02:30:54 +01:00
Richard Davey
3845461c03 Swapped t position in CatmullRom 2017-09-21 02:30:35 +01:00
Richard Davey
10c58f8e05 Commented out Frenet Frames method (not really needed) 2017-09-21 02:03:54 +01:00
Richard Davey
9ec7a52dcc Added Vector2.normalizeRightHand 2017-09-21 02:03:37 +01:00
Richard Davey
1439144fae Added missing Curve constructor calls (opps!) and fixed tmpVec assignment in getLengths 2017-09-21 01:19:27 +01:00
Richard Davey
bbfb8e4f12 Overhauled generateTexture. Can now update existing texture or draw direct to a canvas. 2017-09-21 00:15:52 +01:00
Richard Davey
cd4d9224d0 Added isCanvas property 2017-09-21 00:15:31 +01:00
Richard Davey
8b2f75a254 WEBGL build flag still needs canvas renderer for generateTexture 2017-09-21 00:15:20 +01:00
Richard Davey
2d357d7526 Moved the Curves objects into their own folder and namespace and optimized the vector creation within them 2017-09-20 23:10:37 +01:00
Richard Davey
aab4896582 Added Vector2.angle method 2017-09-20 23:10:03 +01:00
Richard Davey
9d3c80ab0c Added Paths.Curve and Curves.Line for linear paths. 2017-09-20 16:51:49 +01:00
Richard Davey
31c05d2138 Moved Hermite to Curves folder. 2017-09-20 16:51:28 +01:00
Richard Davey
04e54efe43 Refined Math.Clamp. 2017-09-20 16:51:15 +01:00
Richard Davey
6aae306aa0 Added Mat4.makeRotationAxis. 2017-09-20 16:51:06 +01:00
Richard Davey
c48501b4ec Added scale isFinite check and Vector3.crossVectors. 2017-09-20 16:50:48 +01:00
Richard Davey
c0d70252d6 Tidying up 2017-09-20 11:18:34 +01:00
Felipe Alfonso
4d63cf7be0 Added more particle emitter properties and linear interpolation for particle's life 2017-09-19 21:21:55 -03:00
Richard Davey
32786ac2db Added x, y, z getters and setters and removed some test code. 2017-09-19 15:49:24 +01:00
Richard Davey
a03922d7d2 Preparing for Beta 3 2017-09-19 15:48:39 +01:00
Richard Davey
aa10f15214 Fixed typo 2017-09-19 15:48:27 +01:00
Richard Davey
a2511548c0 SetBlendMode Action 2017-09-19 02:04:17 +01:00
Richard Davey
42e792e076 Added createRect method 2017-09-19 01:35:01 +01:00
Richard Davey
a90e788528 Added createMultiple and refactored randomCube, etc to take optional arrays of Sprite3Ds 2017-09-19 00:45:32 +01:00
Richard Davey
809593ea34 Vec3 and Vec4 can now take a Vec2, 3 or 4 as a valid type of the add, sub, mult and divide methods 2017-09-19 00:45:03 +01:00
Richard Davey
d6fe678966 Added Sprite3D.fastHide option and tidied up the Camera3D matrix transform 2017-09-19 00:00:24 +01:00
Richard Davey
df0c457b0d Added randomisation options 2017-09-18 21:48:38 +01:00
Richard Davey
11aa39e29e Removed the Vector random methods and moved to their own function as they're swappable between each other 2017-09-18 21:48:26 +01:00
Richard Davey
44ab157523 Removed comments and tidied up arguments 2017-09-18 20:52:23 +01:00
Richard Davey
696da1dcfb Fix #3059 2017-09-18 20:52:01 +01:00
Richard Davey
66dfa8f9cb Bumping to Beta 2. 2017-09-18 14:44:56 +01:00
Richard Davey
8f0fb7029e Added pixelScale property and updated child removal functions. Removed z-index visibility check from Sprite3D. 2017-09-18 14:44:45 +01:00
Richard Davey
b6ae9bf511 Moved projection scale to local property 2017-09-18 02:11:52 +01:00
Richard Davey
555b0e2586 Added ability to scale axis independantly 2017-09-18 02:01:40 +01:00
Richard Davey
14e6f9f067 Added Sprite3D Game Object and ability for Camera3D to manage them 2017-09-18 01:58:26 +01:00
Richard Davey
8363177369 Merge pull request #3057 from igorpetushkov/ph3
[.Offscreen-For-WebGL-XXXXXXXX] render error
2017-09-18 00:27:37 +01:00
Richard Davey
4dbe015270 Merge pull request #3058 from igorpetushkov/ph4
Fix 'scene is not defined' in GroupCreator
2017-09-18 00:26:20 +01:00
Richard Davey
7a129bb344 Merge pull request #3056 from igorpetushkov/ph2
Move loading __DEFAULT and __MISSING images to boot function.
2017-09-18 00:24:05 +01:00
Richard Davey
5e583ccce4 Moved Scene Camera Manager to the cameras folder, split it all up and tidied everything up 2017-09-18 00:21:41 +01:00
Felipe Alfonso
6ccb6541d9 Particle Renderer + Basic Particle Movement 2017-09-17 17:13:40 -03:00
Igor Petushkov
762d80f162 Fix 'scene is not defined' in GroupCreator 2017-09-17 19:30:41 +03:00
Igor Petushkov
07386a29ac Fix [.Offscreen-For-WebGL-XXXXXXXX] render error 2017-09-17 18:53:31 +03:00
Igor Petushkov
267cb95c6b Move loading __DEFAULT and __MISSING images to boot function. 2017-09-16 23:07:42 +03:00
Richard Davey
413d50ca1d Fixed rotateAround method 2017-09-16 04:00:45 +01:00
Richard Davey
2062b625d7 Fixed divide by zero error in Camera projection 2017-09-16 03:36:39 +01:00
Richard Davey
e224faa903 Added space and shift to createCursors method 2017-09-16 03:08:09 +01:00
Richard Davey
39d1f64030 Removed Camera3D folder and merged into cameras folder and namespace. 2017-09-16 03:07:57 +01:00
Richard Davey
2d6c00125f Tidying up code and remove old files 2017-09-16 02:31:33 +01:00
Richard Davey
545f2073dc Removed vecmath folder and updated references. 2017-09-15 16:46:36 +01:00
Richard Davey
f048473ab9 Fixed the prototype assignments. 2017-09-15 16:46:35 +01:00
Richard Davey
7be33051ca Added all the vector math classes: Vector2, Vector3, Vector4, Matrix3, Matrix4 and Quaternion. Exposed via Phaser.Math namespace. 2017-09-15 16:46:35 +01:00
Richard Davey
f78102989e Removed no-mixed-ops rule as it goes against lots of our code. 2017-09-15 16:46:35 +01:00
Felipe Alfonso
58c997025e ParticleEmitter base 2017-09-15 11:03:45 -03:00
Richard Davey
83d985b4b2 Testing out a 3D Camera 2017-09-15 04:04:51 +01:00
Richard Davey
fb81fa514b Renamed z property to depth to allow for future 3D cameras 2017-09-14 03:12:00 +01:00
Richard Davey
b4edeaec10 Updated GameObjectCreator to use same system as GameObjectFactory. 2017-09-14 02:27:29 +01:00
Richard Davey
651a6b3fac Game Objects module includes factories now 2017-09-14 01:53:47 +01:00
Richard Davey
229af2dffd Added loadArray back in (used by the Scene Manager after all) 2017-09-14 01:53:33 +01:00
Richard Davey
1340e6930f Refactored the GameObjectFactory so it's now populated by the GameObjects directly, avoids globbing all GOs into it 2017-09-14 01:32:10 +01:00
Richard Davey
bc7ef9485c Merge pull request #3051 from igorpetushkov/master
Reduce anims.load duplication
2017-09-14 00:12:57 +01:00
Felipe Alfonso
dc45945d99 WebGL Specific Game Objects work with restored context, except EffectLayer and RenderPass. That would require developer to rebind render targets and resources 2017-09-13 17:54:32 -03:00