Merge remote-tracking branch 'upstream/master'

Author: nkholski

.eslintignore

@@ -1,8 +1,10 @@
-merge/Intro.js
-merge/Outro.js
-merge/plugins/path/
-merge/physics/p2/p2.js
-merge/animation/creature/
-src/physics/matter-js/
-src/renderer/webgl/renderers/shapebatch/earcut.js
-webpack.*.js
+src/phaser-arcade-physics.js
+src/animations/config.json
+src/physics/matter-js/lib/
+src/physics/matter-js/poly-decomp/
+src/polyfills/
+src/renderer/webgl/shaders/
+src/geom/polygon/Earcut.js
+src/utils/array/StableSort.js
+src/utils/object/Extend.js
+src/structs/RTree.js

.eslintrc.json

@@ -1,4 +1,5 @@
 {
+    "root": true,
     "env": {
         "browser": true,
         "es6": true,
@@ -10,6 +11,7 @@
         "CANVAS_RENDERER": true,
         "Phaser": true,
         "p2": true,
+        "process": true,
         "ActiveXObject": true
     },
     "rules": {

.github/CONTRIBUTING.md

@@ -14,7 +14,7 @@ Before contributing, please read the [code of conduct](https://github.com/photon
 
 **3. Create an isolated and reproducible test case.** If you are reporting a bug, make sure you also have a minimal, runnable, code example that reproduces the problem you have.
 
-**4. Include a live example.** After narrowing your code down to only the problem areas, make use of [jsFiddle][1], [jsBin][2], or a link to your live site so that we can view a live example of the problem.
+**4. Include a live example.** After narrowing your code down to only the problem areas, make use of [jsFiddle][1], [jsBin][2], [CodePen][5], or a link to your live site so that we can view a live example of the problem.
 
 **5. Share as much information as possible.** Include browser version affected, your OS, version of the library, steps to reproduce, etc. "X isn't working!!!1!" will probably just be closed.
 
@@ -74,3 +74,4 @@ Thanks to Chad for creating the original Pixi.js Contributing file which we adap
 [2]: http://jsbin.com/
 [3]: http://nodejs.org
 [4]: http://www.html5gamedevs.com/forum/14-phaser/
+[5]: https://codepen.io/pen?template=YeEWom "Phaser 3 game template"

.github/ISSUE_TEMPLATE.md

@@ -10,7 +10,7 @@ This Issue is about (delete as applicable)
 * An error on the web site
 * A problem with my own code
 
-API errors must include example code showing what happens, and why you don't believe this is the expected behavior. Issues posted without code take _far_ longer to get resolved, _if ever_. Feel free to use a site such as jsbin to demo the problem. If we can run it, and see the error, we can usually fix it.
+API errors must include example code showing what happens, and why you don't believe this is the expected behavior. Issues posted without code take _far_ longer to get resolved, _if ever_. Feel free to use a site such as jsBin or [CodePen](https://codepen.io/pen?template=YeEWom) to demo the problem. If we can run it, and see the error, we can usually fix it.
 
 If your Issue contains _any_ form of hostility it will be instantly closed.
 

CHANGELOG.md

@@ -0,0 +1,78 @@
+# Change Log
+
+## Version 3.2.0 - In Development
+
+### New Features
+### Bug Fixes
+### Updates
+
+## Version 3.1.2 - 23rd February 2018
+
+### Updates
+
+* Hundreds of JSDoc fixes across the whole API.
+* Tween.updateTweenData will now check to see if the Tween target still exists before trying to update its properties.
+* If you try to use a local data URI in the Loader it now console warns instead of logs (thanks @samme)
+
+### Bug Fixes
+
+* The KeyCode `FORWAD_SLASH` had a typo and has been changed to `FORWARD_SLASH`. Fix #3271 (thanks @josedarioxyz)
+* Fixed issue with vertex buffer creation on Static Tilemap Layer, causing tilemap layers to appear black. Fix #3266 (thanks @akleemans)
+* Implemented Static Tilemap Layer scaling and Tile alpha support.
+* Fixed issue with null texture on Particle Emitter batch generation. This would manifest if you had particles with blend modes on-top of other images not appearing.
+* Added missing data parameter to ScenePlugin. Fixes #3810 (thanks @AleBles)
+
+## Version 3.1.1 - 20th February 2018
+
+### Updates
+
+* The entire codebase now passes our eslint config (which helped highlight a few errors), if you're submitting a PR, please ensure your PR passes the config too.
+* The Web Audio Context is now suspended instead of closed to allow for prevention of 'Failed to construct AudioContext: maximum number of hardware contexts reached' errors from Chrome in a hot reload environment. We still strongly recommend reusing the same context in a production environment. See [this example](http://labs.phaser.io/view.html?src=src%5Caudio%5CWeb%20Audio%5CReuse%20AudioContext.js) for details. Fixes #3238 (thanks @z0y1 @Ziao)
+* The Webpack shell plugin now fires on `onBuildExit`, meaning it'll update the examples if you use `webpack watch` (thanks @rblopes)
+* Added `root: true` flag to the eslint config to stop it scanning further-up the filesystem.
+
+### Bug Fixes
+
+* Math.Fuzzy.Floor had an incorrect method signature.
+* Arcade Physics World didn't import GetOverlapX or GetOverlapY, causing `separateCircle` to break.
+* TileSprite was missing a gl reference, causing it to fail during a context loss and restore.
+* The Mesh Game Object Factory entry had incorrect arguments passed to Mesh constructor.
+* Removed unused `_queue` property from `ScenePlugin` class (thanks @rblopes)
+* The variable `static` is no longer used in Arcade Physics, fixing the 'static is a reserved word' in strict mode error (thanks @samme)
+* Fixed `Set.union`, `Set.intersect` and `Set.difference` (thanks @yupaul)
+* The corner tints were being applied in the wrong order. Fixes #3252 (thanks @Rybar)
+* BitmapText objects would ignore calls to setOrigin. Fixes #3249 (thanks @amkazan)
+* Fixed a 1px camera jitter and bleeding issue in the renderer. Fixes #3245 (thanks @bradharms)
+* Fixed the error `WebGL: INVALID_ENUM: blendEquation: invalid mode.` that would arise on iOS. Fixes #3244 (thanks @Ziao)
+* The `drawBlitter` function would crash if `roundPixels` was true. Fixes #3243 (thanks @Jerenaux and @vulcanoidlogic)
+
+## Version 3.1.0 - Onishi - 16th February 2018
+
+### Updates
+
+* Vertex resource handling code updated, further optimizing the WebGL batching. You should now see less gl ops per frame across all batches.
+* The `Blitter` game object has been updated to use the `List` structure instead of `DisplayList`.
+* Arcade Physics World `disableBody` has been renamed `disableGameObjectBody` to more accurately reflect what it does.
+* Lots of un-used properties were removed from the Arcade Physics Static Body object.
+* Arcade Physics Static Body can now refresh itself from its parent via `refreshBody`.
+
+### Bug Fixes
+
+* A couple of accidental uses of `let` existed, which broke Image loading in Safari # (thanks Yat Hin Wong)
+* Added the static property `Graphics.TargetCamera` was added back in which fixed `Graphics.generateTexture`.
+* The SetHitArea Action now calls `setInteractive`, fixing `Group.createMultiple` when a hitArea has been set.
+* Removed rogue Tween emit calls. Fix #3222 (thanks @ZaDarkSide)
+* Fixed incorrect call to TweenManager.makeActive. Fix #3219 (thanks @ZaDarkSide)
+* The Depth component was missing from the Zone Game Object. Fix #3213 (thanks @Twilrom)
+* Fixed issue with `Blitter` overwriting previous objects vertex data.
+* The `Tile` game object tinting was fixed, so tiles now honor alpha values correctly.
+* The `BitmapMask` would sometimes incorrectly bind its resources.
+* Fixed the wrong Extend target in MergeXHRSettings (thanks @samme)
+
+### New Features
+
+* Destroying a Game Object will now call destroy on its physics body, if it has one set.
+* Arcade Physics Colliders have a new `name` property and corresponding `setName` method.
+* Matter.js bodies now have an inlined destroy method that removes them from the World.
+* Impact bodies now remove themselves from the World when destroyed.
+* Added Vector2.ZERO static property.

README.md

@@ -11,7 +11,7 @@ Along with the fantastic open source community, Phaser is actively developed and
 Thousands of developers worldwide use Phaser. From indies and multi-national digital agencies, to schools and Universities. Each creating their own incredible [games](https://phaser.io/games/).
 
 **Visit:** The [Phaser website](https://phaser.io) and follow on [Twitter](https://twitter.com/phaser_) (#phaserjs)<br />
-**Learn:** [API Docs](https://phaser.io/docs), [Support Forum][forum] and [StackOverflow](https://stackoverflow.com/questions/tagged/phaser-framework)<br />
+**Learn:** [API Docs](https://github.com/photonstorm/phaser3-docs), [Support Forum][forum] and [StackOverflow](https://stackoverflow.com/questions/tagged/phaser-framework)<br />
 **Code:** 700+ [Examples](https://labs.phaser.io) (source available in this [repo][examples])<br />
 **Read:** Weekly [Phaser World](#newsletter) Newsletter<br />
 **Chat:** [Slack](https://phaser.io/community/slack) and [Discord](https://phaser.io/community/discord)<br />
@@ -24,7 +24,9 @@ Grab the source and join in the fun!
 
 <div align="center"><img src="https://phaser.io/images/github/news.jpg"></div>
 
-> 12th February 2018
+> 23rd February 2018
+
+**Updated:** Thank you for the continued amazing response to the 3.0.0 release! We've carried on working hard and now prepared 3.1.2 for you, which is available today. Check out the [Change Log](#changelog) for more details.
 
 After 1.5 years in the making, tens of thousands of lines of code, hundreds of examples and countless hours of relentless work: Phaser 3 is finally out. It has been a real labor of love and then some!
 
@@ -92,13 +94,13 @@ npm install phaser
 [Phaser is on jsDelivr](http://www.jsdelivr.com/projects/phaser), a "super-fast CDN for developers". Include the following in your html:
 
 ```html
-<script src="//cdn.jsdelivr.net/npm/phaser@3.0.0/dist/phaser.js"></script>
+<script src="//cdn.jsdelivr.net/npm/phaser@3.1.2/dist/phaser.js"></script>
 ```
 
 or the minified version:
 
 ```html
-<script src="//cdn.jsdelivr.net/npm/phaser@3.0.0/dist/phaser.min.js"></script>
+<script src="//cdn.jsdelivr.net/npm/phaser@3.1.2/dist/phaser.min.js"></script>
 ```
 
 ### License
@@ -110,7 +112,13 @@ Phaser is released under the [MIT License](https://opensource.org/licenses/MIT).
 
 <img src="https://phaser.io/images/github/learn.jpg" align="right">
 
-Phaser 3 is so brand new the paint is still wet. As such we don't yet have any guides or tutorials! This will change in the coming weeks and we'll update this area as they emerge. For now, please subscribe to the [Phaser World](https://phaser.io/community/newsletter) newsletter as we'll publish them in there first.
+Phaser 3 is so brand new the paint is still wet, but tutorials and guides are starting to come out!
+
+* [Getting Started with Phaser 3](https://phaser.io/tutorials/getting-started-phaser3) (useful if you are completely new to Phaser)
+* [Making your first Phaser 3 Game](https://phaser.io/tutorials/making-your-first-phaser-3-game)
+* [Phaser 3 Bootstrap and Platformer Example](https://phaser.io/news/2018/02/phaser-3-bootstrap-platformer)
+
+Also, please subscribe to the [Phaser World](https://phaser.io/community/newsletter) newsletter for details about new tutorials as they are published.
 
 ### Source Code Examples
 
@@ -229,8 +237,25 @@ Should you wish to build Phaser 3 from source ensure you have the required packa
 You can then run `webpack` to perform a dev build to the `build` folder, including source maps for local testing, or run `npm run dist` to create a minified packaged build into the `dist` folder.
 
 ![Change Log](https://phaser.io/images/github/div-change-log.png "Change Log")
+<a name="changelog"></a>
+
+## Version 3.1.2 - 23rd February 2018
+
+### Updates
+
+* Hundreds of JSDoc fixes across the whole API.
+* Tween.updateTweenData will now check to see if the Tween target still exists before trying to update its properties.
+* If you try to use a local data URI in the Loader it now console warns instead of logs (thanks @samme)
+
+### Bug Fixes
+
+* The KeyCode `FORWAD_SLASH` had a typo and has been changed to `FORWAD_SLASH`. Fix #3271 (thanks @josedarioxyz)
+* Fixed issue with vertex buffer creation on Static Tilemap Layer, causing tilemap layers to appear black. Fix #3266 (thanks @akleemans)
+* Implemented Static Tilemap Layer scaling and Tile alpha support.
+* Fixed issue with null texture on Particle Emitter batch generation. This would manifest if you had particles with blend modes on-top of other images not appearing.
+* Added missing data parameter to ScenePlugin. Fixes #3810 (thanks @AleBles)
 
-We have always been meticulous in recording changes to the Phaser code base, and where relevant, giving attribution to those in the community who helped. This is something we'll continue with Phaser 3 and you'll see this section expand as we push through the 3.0.0 releases.
+Please see the complete [Change Log]((https://github.com/photonstorm/phaser/blob/master/CHANGELOG.md)) for previous releases.
 
 Looking for a v2 change? Check out the [Phaser CE Change Log](https://github.com/photonstorm/phaser-ce/blob/master/CHANGELOG.md)
 
@@ -261,8 +286,8 @@ All rights reserved.
 
 "Above all, video games are meant to be just one thing: fun. Fun for everyone." - Satoru Iwata
 
-[get-js]: https://github.com/photonstorm/phaser/releases/download/v3.0.0/phaser.js
-[get-minjs]: https://github.com/photonstorm/phaser/releases/download/v3.0.0/phaser.min.js
+[get-js]: https://github.com/photonstorm/phaser/releases/download/v3.1.2/phaser.js
+[get-minjs]: https://github.com/photonstorm/phaser/releases/download/v3.1.2/phaser.min.js
 [clone-http]: https://github.com/photonstorm/phaser.git
 [clone-ssh]: git@github.com:photonstorm/phaser.git
 [clone-ghwin]: github-windows://openRepo/https://github.com/photonstorm/phaser