Merge branch 'dev' into multitexture-gl

Author: bitnenfer

Gruntfile.js

@@ -425,7 +425,7 @@ module.exports = function (grunt) {
 
     });
 
-    grunt.registerTask('build', 'Compile all Phaser versions just to the dist folder', function() {
+    grunt.registerTask('build', 'Compile all Phaser versions just to the temporary dist folder', function() {
 
         grunt.option('exclude', 'ninja,creature');
         grunt.option('filename', 'phaser');

README.md

@@ -40,7 +40,7 @@ Grab the source and join in the fun!
 
 > In Development
 
-This is the development branch, where we are building Phaser 2.6.2.
+This is the development branch, where we are building Phaser 2.7.0.
 
 Check the [Change Log](#change-log) to see what we've done so far. Or switch to the master branch for the current stable release.
 
@@ -107,15 +107,15 @@ Using Browserify? Please [read this](#browserify).
 
 [jsDelivr](http://www.jsdelivr.com/#!phaser) is a "super-fast CDN for developers". Include the following in your html:
 
-`<script src="//cdn.jsdelivr.net/phaser/2.6.2/phaser.js"></script>`
+`<script src="//cdn.jsdelivr.net/phaser/2.7.0/phaser.js"></script>`
 
 or the minified version:
 
-`<script src="//cdn.jsdelivr.net/phaser/2.6.2/phaser.min.js"></script>`
+`<script src="//cdn.jsdelivr.net/phaser/2.7.0/phaser.min.js"></script>`
 
 [cdnjs.com](https://cdnjs.com/libraries/phaser) also offers a free CDN service. They have all versions of Phaser and even the custom builds:
 
-`<script src="https://cdnjs.cloudflare.com/ajax/libs/phaser/2.6.2/phaser.js"></script>`
+`<script src="https://cdnjs.cloudflare.com/ajax/libs/phaser/2.7.0/phaser.js"></script>`
 
 ### Phaser Sandbox
 
@@ -305,20 +305,22 @@ You can read all about the philosophy behind Lazer [here](http://phaser.io/news/
 ![Change Log](http://phaser.io/images/github/div-change-log.png "Change Log")
 <a name="change-log"></a>
 
-## Version 2.6.2 - "Kore Springs" - In Development
+## Version 2.7.0 - "Kore Springs" - In Development
 
 ### New Features
 
+* The brand new WebGL Tilemap Renderer is available in this release of Phaser. Using custom developed shaders, map parsing and index batching, it finally makes tilemap rendering as fast as it possibly can be in WebGL.
 * Group.getRandomExists will return a random child from the Group that has exists set to true.
 * Group.getAll will return all children in the Group, or a section of the Group, with the optional ability to test if the child has a property matching the given value or not.
 * Group.iterate has a new `returnType`: `RETURN_ALL`. This allows you to return all children that pass the iteration test in an array.
 
 ### Updates
 
 * TypeScript definitions fixes and updates (thanks )
-* Docs typo fixes (thanks )
+* Docs typo fixes (thanks @rroylance @Owumaro)
 * The InputHandler.flagged property has been removed. It was never used internally, or exposed via the API, so was just overhead.
 * The src/system folder has been removed and all files relocated to the src/utils folder. This doesn't change anything from an API point of view, but did change the grunt build scripts slightly.
+* BitmapData.shadow and BitmapData.text now both `return this` keeping them in-line with the docs (thanks @greeny #2634)
 
 ### Bug Fixes
 
@@ -367,10 +369,10 @@ All rights reserved.
 
 [![Analytics](https://ga-beacon.appspot.com/UA-44006568-2/phaser/index)](https://github.com/igrigorik/ga-beacon)
 
-[get-js]: https://github.com/photonstorm/phaser/releases/download/v2.6.2/phaser.js
-[get-minjs]: https://github.com/photonstorm/phaser/releases/download/v2.6.2/phaser.min.js
-[get-zip]: https://github.com/photonstorm/phaser/archive/v2.6.2.zip
-[get-tgz]: https://github.com/photonstorm/phaser/archive/v2.6.2.tar.gz
+[get-js]: https://github.com/photonstorm/phaser/releases/download/v2.7.0/phaser.js
+[get-minjs]: https://github.com/photonstorm/phaser/releases/download/v2.7.0/phaser.min.js
+[get-zip]: https://github.com/photonstorm/phaser/archive/v2.7.0.zip
+[get-tgz]: https://github.com/photonstorm/phaser/archive/v2.7.0.tar.gz
 [clone-http]: https://github.com/photonstorm/phaser.git
 [clone-ssh]: git@github.com:photonstorm/phaser.git
 [clone-svn]: https://github.com/photonstorm/phaser

build/config.php

@@ -409,10 +409,13 @@
     if ($modules['tilemap'])
     {
         echo <<<EOL
+    <script src="$path/src/pixi/extras/Tilemap.js"></script>
+    <script src="$path/src/pixi/renderers/webgl/shaders/TilemapShader.js"></script>
     <script src="$path/src/tilemap/ImageCollection.js"></script>
     <script src="$path/src/tilemap/Tile.js"></script>
     <script src="$path/src/tilemap/Tilemap.js"></script>
     <script src="$path/src/tilemap/TilemapLayer.js"></script>
+    <script src="$path/src/tilemap/TilemapLayerGL.js"></script>
     <script src="$path/src/tilemap/TilemapParser.js"></script>
     <script src="$path/src/tilemap/Tileset.js"></script>