Richard Davey af7cc12e81 Merge remote-tracking branch 'origin/master' into dev ... # Conflicts: # README.md # package.json # src/Phaser.js		2016-06-17 13:09:35 +01:00
..
Asset Pack JSON Format	Updated Asset JSON (#1947)	2015-07-27 14:13:58 +01:00
docgen	Moved docgen into the Resources folder.	2014-11-25 00:24:29 +00:00
docstrap-master	Phaser 2.4.9 release.	2016-06-17 01:11:24 +01:00
Flash to Phaser JSFL	User guides for the Flash to Phaser JSFL script.	2014-05-28 02:27:25 +01:00
IE9 Polyfill	Added base64 polyfill for new Tiled export support.	2015-09-14 11:21:48 +01:00
jsdoc Export JSON/template	Replace the grunt docs tasks with grunt-jsdoc	2015-01-22 16:22:51 +01:00
Ninja Physics Debug Tiles	Renamed px2p and p2px to: pxm and mpx (px to meters and meters to px). Also removed from Math.	2014-03-12 00:07:27 +00:00
Phaser Logo	Updated docs.	2014-06-29 21:19:37 +01:00
PhysicsEditor Exporter	Add option to prefix shape name and optimize JSON output	2015-09-16 14:00:24 +02:00
Pixi Logo	Phaser 2.1.3 build.	2014-10-22 21:42:12 +01:00
Project Templates	dry mobile template	2016-06-01 17:05:42 -04:00
Screen Shots	Added screen shots.	2015-01-08 01:28:38 +00:00
tutorials	Fix reign/rein typo.	2016-06-14 21:00:06 -05:00
ConsoleLogColors.psd	Phaser 2.5.0 Release.	2016-06-17 12:46:56 +01:00
Migration Guide.md	Update Migration Guide.md	2014-03-23 22:34:50 +02:00
release-names.txt	Preparing for 2.4.10 development.	2016-06-17 03:05:14 +01:00
zwoptex-phaser.template	Tidying up the repo and adding in new documentation.	2013-10-23 14:00:29 +01:00