Skip to content

Commit 7593a80

Browse files
committed
Merge branch 'master' of https://github.com/photonstorm/phaser
2 parents 8aa54e8 + f61040d commit 7593a80

40 files changed

Lines changed: 27819 additions & 25236 deletions

CHANGELOG.md

Lines changed: 53 additions & 13 deletions
Large diffs are not rendered by default.

dist/phaser-arcade-physics.js

Lines changed: 13078 additions & 12125 deletions
Large diffs are not rendered by default.

dist/phaser-arcade-physics.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/phaser.js

Lines changed: 13568 additions & 12621 deletions
Large diffs are not rendered by default.

dist/phaser.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package-lock.json

Lines changed: 131 additions & 74 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,16 +63,16 @@
6363
"devDependencies": {
6464
"clean-webpack-plugin": "^3.0.0",
6565
"dts-dom": "^3.6.0",
66-
"eslint": "^7.4.0",
66+
"eslint": "^7.7.0",
6767
"eslint-plugin-es5": "^1.5.0",
6868
"fs-extra": "^9.0.1",
69-
"jsdoc": "^3.6.4",
69+
"jsdoc": "^3.6.5",
7070
"node-sloc": "^0.1.12",
7171
"remove-files-webpack-plugin": "^1.4.3",
72-
"typescript": "^3.9.6",
72+
"typescript": "^4.0.2",
7373
"uglifyjs-webpack-plugin": "^2.2.0",
7474
"vivid-cli": "^1.1.2",
75-
"webpack": "^4.43.0",
75+
"webpack": "^4.44.1",
7676
"webpack-cli": "^3.3.12",
7777
"webpack-shell-plugin": "^0.5.0"
7878
},

scripts/bundle-shaders.js

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,11 @@ let fs = require('fs-extra');
33
/*
44
BitmapMask.frag
55
BitmapMask.vert
6-
DeferredDiffuse.frag
7-
DeferredDiffuse.vert
8-
ForwardDiffuse.frag
9-
GBuffer.frag
10-
TextureTint.frag
11-
TextureTint.vert
6+
Light.frag
7+
Single.frag
8+
Single.vert
9+
Multi.frag
10+
Multi.vert
1211
*/
1312

1413
let srcdir = './src/renderer/webgl/shaders/src/';

src/cameras/2d/effects/Fade.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ var Fade = new Class({
301301
* @method Phaser.Cameras.Scene2D.Effects.Fade#postRenderWebGL
302302
* @since 3.5.0
303303
*
304-
* @param {Phaser.Renderer.WebGL.Pipelines.TextureTintPipeline} pipeline - The WebGL Pipeline to render to.
304+
* @param {Phaser.Renderer.WebGL.Pipelines.MultiPipeline} pipeline - The WebGL Pipeline to render to. Must provide the `drawFillRect` method.
305305
* @param {function} getTintFunction - A function that will return the gl safe tint colors.
306306
*
307307
* @return {boolean} `true` if the effect drew to the renderer, otherwise `false`.

src/cameras/2d/effects/Flash.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ var Flash = new Class({
269269
* @method Phaser.Cameras.Scene2D.Effects.Flash#postRenderWebGL
270270
* @since 3.5.0
271271
*
272-
* @param {Phaser.Renderer.WebGL.Pipelines.TextureTintPipeline} pipeline - The WebGL Pipeline to render to.
272+
* @param {Phaser.Renderer.WebGL.Pipelines.MultiPipeline} pipeline - The WebGL Pipeline to render to. Must provide the `drawFillRect` method.
273273
* @param {function} getTintFunction - A function that will return the gl safe tint colors.
274274
*
275275
* @return {boolean} `true` if the effect drew to the renderer, otherwise `false`.

0 commit comments

Comments
 (0)