Skip to content

Commit a137883

Browse files
committed
Merge remote-tracking branch 'upstream/master'
2 parents 57f159c + 41f9277 commit a137883

174 files changed

Lines changed: 52284 additions & 44102 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

CHANGELOG.md

Lines changed: 163 additions & 11 deletions
Large diffs are not rendered by default.

README.md

Lines changed: 186 additions & 159 deletions
Large diffs are not rendered by default.

dist/phaser-arcade-physics.js

Lines changed: 15837 additions & 13056 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-core.js

Lines changed: 14048 additions & 12614 deletions
Large diffs are not rendered by default.

dist/phaser-core.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: 16020 additions & 13239 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: 1213 additions & 1540 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "phaser",
3-
"version": "3.11.0-beta1",
4-
"release": "Leafa",
3+
"version": "3.12.0-beta1",
4+
"release": "Silica",
55
"description": "A fast, free and fun HTML5 Game Framework for Desktop and Mobile web browsers.",
66
"author": "Richard Davey <rich@photonstorm.com> (http://www.photonstorm.com)",
77
"logo": "https://raw.github.com/photonstorm/phaser/master/phaser-logo-small.png",
@@ -42,11 +42,11 @@
4242
"eslint": "^4.19.1",
4343
"eslint-plugin-es5": "^1.3.1",
4444
"fs-extra": "^6.0.0",
45-
"node-sloc": "^0.1.10",
46-
"uglifyjs-webpack-plugin": "^1.2.5",
45+
"node-sloc": "^0.1.11",
46+
"uglifyjs-webpack-plugin": "^1.2.7",
4747
"vivid-cli": "^1.1.2",
48-
"webpack": "^4.6.0",
49-
"webpack-cli": "^2.1.2",
48+
"webpack": "^4.16.0",
49+
"webpack-cli": "^2.1.5",
5050
"webpack-shell-plugin": "^0.5.0"
5151
},
5252
"dependencies": {

0 commit comments

Comments
 (0)