diff --git a/CHANGELOG.md b/CHANGELOG.md
index f73cdca566..eb87be49f5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,27 @@
# Change Log
+## Version 2.4.2 - "Altara" - 29th July 2015
+
+### Updates
+
+* TypeScript definitions fixes and updates (thanks @clark-stevenson @shivinsky)
+* JSDoc typo fixes (thanks @DrkSephy)
+* TilemapLayer - Fixed unmatched `context.save` and `context.restore` calls (thanks @MortimerGoro #1934)
+* Cache.getFrame has a new `cache` parameter (that defaults to the Image cache, but can be changed to any other)
+* Cache.getFrameCount has a new `cache` parameter (that defaults to the Image cache, but can be changed to any other)
+* Cache.getFrameData has a new `cache` parameter (that defaults to the Image cache, but can be changed to any other)
+* Cache.hasFrameData has a new `cache` parameter (that defaults to the Image cache, but can be changed to any other)
+* Cache.getFrameByIndex has a new `cache` parameter (that defaults to the Image cache, but can be changed to any other)
+* Cache.getFrameByName has a new `cache` parameter (that defaults to the Image cache, but can be changed to any other)
+* Device.canPlayVideo now checks for `ogv` as a valid file extension for OGG video files (thanks @JB-Tellez #1928)
+* Phaser.Sound will now automatically check the Cache to see if the audio file it is using is still there or not. If not then it will automatically called `Sound.destroy` on itself. If you do not desire this result then you should ensure that you undertake all house-keeping yourself, and properly destroy Sound objects _before_ calling `Cache.removeSound` (#1946)
+
+### Bug Fixes
+
+* DeviceButton would try to set `altKey`, `shiftKey` and `ctrlKey` even for Joypads (thanks @zatch #1939)
+* Pointer.move would accidentally reset the `isDown` status of the Pointer on touch devices, which broke things like Sprite input events when built to native apps or run locally (#1932 #1943)
+* Pointer.onDown (and input enabled items like Buttons) would fail on FireFox / Linux and CocoonJS (#1944 #1945)
+
## Version 2.4.1 - "Ionin Spring" - 24th July 2015
This is a small point release that updates the Creature runtimes and fixes a couple of small cache issues.
diff --git a/Gruntfile.js b/Gruntfile.js
index 31ac16b2e8..ea3ad996e1 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -14,6 +14,9 @@ module.exports = function (grunt) {
docs_dir: 'docs',
sourcemap: false,
filename: 'phaser',
+ pixiFilename: 'pixi.js',
+ p2Filename: 'p2.js',
+ creatureFilename: 'creature.js',
filelist: [],
banner: require('fs').readFileSync(__dirname + '/tasks/banner.txt', 'utf8')
}
@@ -85,9 +88,13 @@ module.exports = function (grunt) {
}
}
- grunt.log.writeln("\nFor example: --exclude p2,tilemap,retrofont");
- grunt.log.writeln("Optional flags: --filename yourfilename and --sourcemap true");
- grunt.log.writeln("Note that some modules have dependencies on others.\n");
+ grunt.log.writeln("\nFor example: --exclude p2,tilemaps,retrofont\n");
+ grunt.log.writeln("Optional flags:\n");
+ grunt.log.writeln("--filename yourfilename (builds to your own custom file name)");
+ grunt.log.writeln("--sourcemap true (creates a source map)");
+ grunt.log.writeln("--split true (splits Phaser, PIXI, p2 and Creature into separate files)");
+ grunt.log.writeln("--uglify true (runs Uglify on the output files)");
+ grunt.log.writeln("\nNote that some modules have dependencies on others.\n");
grunt.fail.fatal("No build options were specified.");
}
@@ -96,8 +103,11 @@ module.exports = function (grunt) {
// Defaults
grunt.config.set('sourcemap', false);
grunt.config.set('filename', 'phaser');
+ grunt.config.set('split', false);
grunt.config.set('target_dir', '<%= release_dir %>');
+ var split = false;
+
// Overrides
if (grunt.option('filename'))
{
@@ -109,6 +119,12 @@ module.exports = function (grunt) {
grunt.config.set('sourcemap', grunt.option('sourcemap'));
}
+ if (grunt.option('split'))
+ {
+ grunt.config.set('split', grunt.option('split'));
+ split = grunt.option('split');
+ }
+
grunt.log.writeln("Excluding modules:\n");
var excludedKeys = [];
@@ -151,60 +167,140 @@ module.exports = function (grunt) {
}
}
- // Ok we know the excludes array is fine, let's get this show started
-
- grunt.log.writeln("\nPackaging Globals ...\n");
+ /////////////////////////////////////////////////////////////////////////
+ // Ok we know the excludes array is fine, let's get this show started //
+ /////////////////////////////////////////////////////////////////////////
var filelist = [];
+ var pixiFilelist = [];
// Clean the working folder
var tasks = [ 'clean:build' ];
- // Prepare the globals first, the libs that live outside of Phaser
+ if (split)
+ {
- // 1) Creature
+ ////////////////////////////////////////
+ // Split build (for Browserify, etc) //
+ ////////////////////////////////////////
- if (!excludedKeys['creature'])
- {
- grunt.log.writeln("-> Creature");
- tasks.push('concat:creatureGlobal');
- filelist.push('<%= modules_dir %>/creature-global.js');
- }
+ grunt.log.writeln("\nSplitting Globals ...\n");
- // 2) P2
+ // 1) Creature
- if (!excludedKeys['p2'])
- {
- grunt.log.writeln("-> P2.js");
- tasks.push('concat:p2Global');
- filelist.push('<%= modules_dir %>/p2-global.js');
- }
+ if (!excludedKeys['creature'])
+ {
+ grunt.log.writeln("-> Creature");
+ tasks.push('concat:creatureGlobalSplit');
- // 3) PIXI
+ if (grunt.option('uglify'))
+ {
+ tasks.push('uglify:creature');
+ }
+ }
- grunt.log.writeln("-> PIXI");
- tasks.push('concat:pixiIntro');
- filelist.push('<%= modules_dir %>/pixi-intro.js');
+ // 2) P2
- // Optional Rope
- if (!excludedKeys['rope'])
- {
- grunt.log.writeln("-> PIXI.Rope");
- tasks.push('concat:pixiRope');
- filelist.push('<%= modules_dir %>/pixi-rope.js');
- }
+ if (!excludedKeys['p2'])
+ {
+ grunt.log.writeln("-> P2.js");
+ tasks.push('concat:p2GlobalSplit');
- // Optional Tilesprite
- if (!excludedKeys['tilesprite'])
- {
- grunt.log.writeln("-> PIXI.TileSprite");
- tasks.push('concat:pixiTileSprite');
- filelist.push('<%= modules_dir %>/pixi-tilesprite.js');
+ if (grunt.option('uglify'))
+ {
+ tasks.push('uglify:p2');
+ }
+ }
+
+ // 3) PIXI
+
+ grunt.log.writeln("-> PIXI");
+ tasks.push('concat:pixiIntro');
+ pixiFilelist.push('<%= modules_dir %>/pixi-intro.js');
+
+ // Optional Rope
+ if (!excludedKeys['rope'])
+ {
+ grunt.log.writeln("-> PIXI.Rope");
+ tasks.push('concat:pixiRope');
+ pixiFilelist.push('<%= modules_dir %>/pixi-rope.js');
+ }
+
+ // Optional Tilesprite
+ if (!excludedKeys['tilesprite'])
+ {
+ grunt.log.writeln("-> PIXI.TileSprite");
+ tasks.push('concat:pixiTileSprite');
+ pixiFilelist.push('<%= modules_dir %>/pixi-tilesprite.js');
+ }
+
+ // PIXI Outro
+ tasks.push('concat:pixiOutro');
+ pixiFilelist.push('<%= modules_dir %>/pixi-outro.js');
+
+ grunt.config.set('pixiFilelist', pixiFilelist);
+
+ tasks.push('concat:pixi');
+
+ if (grunt.option('uglify'))
+ {
+ tasks.push('uglify:pixi');
+ }
}
+ else
+ {
+ ///////////////////
+ // Single build //
+ ///////////////////
+
+ grunt.log.writeln("\nPackaging Globals ...\n");
+
+ // Prepare the globals first, the libs that live outside of Phaser
+
+ // 1) Creature
+
+ if (!excludedKeys['creature'])
+ {
+ grunt.log.writeln("-> Creature");
+ tasks.push('concat:creatureGlobal');
+ filelist.push('<%= modules_dir %>/creature-global.js');
+ }
- // PIXI Outro
- tasks.push('concat:pixiOutro');
- filelist.push('<%= modules_dir %>/pixi-outro.js');
+ // 2) P2
+
+ if (!excludedKeys['p2'])
+ {
+ grunt.log.writeln("-> P2.js");
+ tasks.push('concat:p2Global');
+ filelist.push('<%= modules_dir %>/p2-global.js');
+ }
+
+ // 3) PIXI
+
+ grunt.log.writeln("-> PIXI");
+ tasks.push('concat:pixiIntro');
+ filelist.push('<%= modules_dir %>/pixi-intro.js');
+
+ // Optional Rope
+ if (!excludedKeys['rope'])
+ {
+ grunt.log.writeln("-> PIXI.Rope");
+ tasks.push('concat:pixiRope');
+ filelist.push('<%= modules_dir %>/pixi-rope.js');
+ }
+
+ // Optional Tilesprite
+ if (!excludedKeys['tilesprite'])
+ {
+ grunt.log.writeln("-> PIXI.TileSprite");
+ tasks.push('concat:pixiTileSprite');
+ filelist.push('<%= modules_dir %>/pixi-tilesprite.js');
+ }
+
+ // PIXI Outro
+ tasks.push('concat:pixiOutro');
+ filelist.push('<%= modules_dir %>/pixi-outro.js');
+ }
// And now for Phaser
@@ -320,6 +416,19 @@ module.exports = function (grunt) {
});
+ grunt.registerTask('split', 'Compile Phaser to dist folder and splits the globals into single files', function() {
+
+ grunt.option('exclude', 'ninja,creature');
+ grunt.option('filename', 'phaser');
+ grunt.option('sourcemap', true);
+ grunt.option('copy', false);
+ grunt.option('uglify', true);
+ grunt.option('split', true);
+
+ grunt.task.run('custom');
+
+ });
+
grunt.registerTask('test', 'Phaser Test Build (all libs)', function() {
grunt.option('exclude', 'ninja,creature');
diff --git a/README.md b/README.md
index 84d6edefd3..99505a6928 100644
--- a/README.md
+++ b/README.md
@@ -16,13 +16,14 @@ Thousands of developers worldwide use it. From indies and multi-national digital
* **Read:** Subscribe to the [Newsletter](https://confirmsubscription.com/h/r/369DE48E3E86AF1E) and grab our [Phaser Books](http://phaser.io/shop)
* **Chat:** [#phaserio IRC channel](http://www.html5gamedevs.com/topic/4470-official-phaserio-irc-channel-phaserio-on-freenode/) on freenode
* **Extend:** With [Phaser Plugins](https://github.com/photonstorm/phaser-plugins)
-* **Be awesome:** Support our work by buying our [books](http://phaser.io/shop/books) and [plugins](http://phaser.io/shop/plugins)
+* **Be awesome:** Support the future of Phaser on [Patreon](https://www.patreon.com/photonstorm) or by buying our [books](http://phaser.io/shop/books) and [plugins](http://phaser.io/shop/plugins)
## Index
- [What's New?](#whats-new)
+- [Support Phaser](#patreon)
- [Download Phaser](#download)
- [Getting Started](#getting-started)
- [Using Phaser](#using-phaser)
@@ -39,21 +40,17 @@ Thousands of developers worldwide use it. From indies and multi-national digital
