Merge remote-tracking branch 'upstream/dev' into dev

Author: Tim van den Eijnden

README.md

@@ -58,73 +58,15 @@ Happy coding everyone! See you on the forums.
 <a name="change-log"></a>
 ## Change Log
 
-Version 2.2.2 - "Alkindar" - 6th January 2015
+Version 2.3.0 - "Tarabon" - in dev
 
 ### New Features
 
-* Phaser.Loader now supports BLOB urls for audio files (thanks @aressler38 #1462)
-* Line.reflect will calculate the reflected, or outgoing angle of two lines. This can be used for Body vs. Line collision responses and rebounds.
-* Line.normalAngle gets the angle of the line normal in radians.
-* Line.normalX and Line.normalY contain the x and y components of the left-hand normal of the line.
-* Line.fromAngle will sets this line to start at the given `x` and `y` coordinates and for the segment to extend at `angle` for the given `length`.
-* BitmapData.drawGroup draws the immediate children of a Phaser.Group to a BitmapData. Children are only drawn if they have their `exists` property set to `true`. The children will be drawn at their `x` and `y` world space coordinates. When drawing it will take into account the child's rotation, scale and alpha values. No iteration takes place. Groups nested inside other Groups will not be iterated through.
-
 ### Updates
 
-* TypeScript definitions fixes and updates (thanks @clark-stevenson @Schmavery)
-* DOM.visualBounds now includes scroll bars (#1429)
-* The new fixed time-step code has been more carefully linked to Pixi transform updates. This should finally put a stop to the tunneling issues that were being reported.
-* Tween.stop fired a different set of onComplete parameters to Tween.update. Both now dispatch `onComplete(target, tween)`` as the parameters in that order (thanks @P0rnflake #1450)
-* Removed redundant `tolerance` parameter from Rectangle.intersects (thanks @toolness #1463)
-* Phaser.Graphics.drawCircle now overrides PIXI.drawCircle which means the docs are now correct re: diameter not radius (thanks @ethankaminski #1454)
-* Device.webAudio check inversed to avoid throwing a warning in Chrome.
-* Mouse.mouseMoveCallback is flagged as deprecated.
-* Remove `tw` and `th` init from TilemapLayer (thanks @nextht #1474)
-* Particles.Arcade.Emitter.makeParticles now checks the given `quantity` value against `Emitter.maxParticles`. If `quantity` is more than `maxParticles` then the `maxParticles` value is reset to the new `quantity` given (as this is how most devs seem to use it).
-* Particles.Arcade.Emitter.emitParticle now returns a boolean depending if a particle was emitted or not.
-* Particles.Arcade.Emitter.update only updates `_counter` if a particle was successfully emitted.
-* Phaser.Point.angleSq removed. It didn't work so any code relying on it would be broken, and it's unclear what it was meant for (thanks @nextht #1396)
-* BitmapData.copy `tx` parameter if `null` and `source` is a Display Object, it will default to `source.x`.
-* BitmapData.copy `ty` parameter if `null` and `source` is a Display Object, it will default to `source.y`.
-
 ### Bug Fixes
 
-* Fix / double-copy for Safari tilemap bug when rendering with delta scrolling. This fixes tilemaps not appearing to update on Safari OS X and iOS specifically (thanks @pnstickne @neurofuzzy @lastnightsparty #1439 #1498)
-* Simplified call to `updateTransform`. This is the unified and verified fix for #1424 #1479 #1490 #1502 and solves issues with physics tunneling and visual glitches under the new time step code.
-* Tween.delay, Tween.repeat and Tween.yoyo will no longer throw an error if called before a TweenData object has been created (via Tween.to or Tween.from) (thanks @SomMeri #1419)
-* The click trampoline added for IE prevented Chrome for Android from being
-able to launch Full Screen mode with the default parameters for
-ScaleManger#startFullScreen (the desktop version of Chrome was not
-affected.). This is now fixed and additional compatibility settings (clickTrampoline) that can be used to configure when such is used. By default the 'when-not-mouse' mode is only enabled for Desktop browsers, where the
-primary input is ubiquitously a mouse. There are no known breaking compatibility changes - the Full Screen should be initiatable in Chrome for Android as it was in 2.1.x. The default Android browser does not support Full Screen (thanks @pnstickne)
-* TilemapParser now checks for image collections, avoiding crashes. These would arise with maps exported from the new release of Tiled (thanks @paul-reilly #1440)
-* Group.replace could still access `newChild.parent` after it was set to `undefined`. This unifies the approach (thanks @pnstickne #1410 #1417)
-* P2.postBroadphaserHandler updated to avoid skipping final 2 pairs.
-* The P2 World constructor wouldn't let you use your own config unless you specified both the gravity *and* broadphase. Now allows one or both (thanks @englercj #1412)
-* The RandomDataGenerator could be seeded with an array of values. However if the array contained a zero it would stop seeding from that point (thanks @jpcloud @pnstickne #1456)
-* Added extra checks to Sound.play to stop it throwing DOM Exception Error 11 if the `sound.readyState` wasn't set or the sound was invalid. Also wrapped `stop()`` call in a `try catch`.
-* Time.reset would incorrectly reset the `_started` property, now maps it to `Time.time` (thanks @XekeDeath #1467)
-* Fix floating point inaccuracy in Tween easing edge cases (thanks @jounii #1492)
-* Phaser.Signal was causing a CSP script-src violations in Cordova and Google Chrome Apps (thanks @elennaro #1494)
-* Added Events.onEnterBounds to the destroy method (thanks @legendary-mich #1497)
-* AnimationManager.destroy is now more careful about clearing up deep references (thanks @Arturszott #1449)
-* Ellipse.right and Ellipse.bottom setters fixed (thanks @nextht #1397)
-* Fixed double Ellipse.getBounds definition (thanks @nextht #1397)
-* TileSprite.loadTexture crashed when textures were updated in WebGL (thanks @pandavigoureux29 #1495)
-
-### Pixi.js 2.2.0 Updates
-
-* The strip class has now three extra properties, canvasPadding, paddingX, and paddingY : @darionco
-* Added mipmap option to to textures.
-* Added the ability to use GL_TRIANGLES when rendering Strips @darionco
-* Added the ability to tint the Graphics.
-* Fixed Y-flipped mask issue on render texture.
-* Fixed the issue where you could an alpha that is more than one and it would.
-* Fixed text issues when using accents.
-* Fixed sprite caching not clearing the previous cached texture : @kambing86
-* Fixed arcTo issues.
-* Vertex buffer and and vertex shader optimisation and reduced memory footprint on the tint and alpha : @bchevalier
-* Applied the new generic updateTransform to spritebatch : @kambing86
+* SoundManager.unlock checks for audio `start` support and falls back to `noteOn` if not found.
 
 For changes in previous releases please see the extensive [Version History](https://github.com/photonstorm/phaser/blob/master/CHANGELOG.md).
 
@@ -154,11 +96,11 @@ Install via [npm](https://www.npmjs.com)
 
 [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.2.2/phaser.js"></script>`
+`<script src="//cdn.jsdelivr.net/phaser/2.3.0/phaser.js"></script>`
 
 or the minified version:
 
-`<script src="//cdn.jsdelivr.net/phaser/2.2.2/phaser.min.js"></script>`
+`<script src="//cdn.jsdelivr.net/phaser/2.3.0/phaser.min.js"></script>`
 
 ### Koding
 
@@ -364,10 +306,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.2.2/phaser.js
-[get-minjs]: https://github.com/photonstorm/phaser/releases/download/v2.2.2/phaser.min.js
-[get-zip]: https://github.com/photonstorm/phaser/archive/v2.2.2.zip
-[get-tgz]: https://github.com/photonstorm/phaser/archive/v2.2.2.tar.gz
+[get-js]: https://github.com/photonstorm/phaser/releases/download/v2.3.0/phaser.js
+[get-minjs]: https://github.com/photonstorm/phaser/releases/download/v2.3.0/phaser.min.js
+[get-zip]: https://github.com/photonstorm/phaser/archive/v2.3.0.zip
+[get-tgz]: https://github.com/photonstorm/phaser/archive/v2.3.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

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "phaser",
-  "version": "2.2.2",
+  "version": "2.3.0",
   "homepage": "http://phaser.io",
   "authors": [
     "photonstorm <rich@photonstorm.com>"

package.json

@@ -1,7 +1,7 @@
 {
   "name": "phaser",
-  "version": "2.2.2",
-  "release": "Alkindar",
+  "version": "2.3.0",
+  "release": "Tarabon",
   "description": "A fast, free and fun HTML5 Game Framework for Desktop and Mobile web browsers.",
   "author": "Richard Davey <rdavey@gmail.com> (http://www.photonstorm.com)",
   "logo": "https://raw.github.com/photonstorm/phaser/master/phaser-logo-small.png",

src/Phaser.js

@@ -10,7 +10,7 @@
 */
 var Phaser = Phaser || {
 
-	VERSION: '2.2.2',
+	VERSION: '2.3.0-dev',
 	GAMES: [],
 
     AUTO: 0,

src/core/ScaleManager.js

@@ -12,7 +12,7 @@
 * The Game size is the logical size of the game; the Display canvas has size as an HTML element.
 *
 * The calculations of these are heavily influenced by the bounding Parent size which is the computed
-* dimenstions of the Display canvas's Parent container/element - the _effective CSS rules of the
+* dimensions of the Display canvas's Parent container/element - the _effective CSS rules of the
 * canvas's Parent element play an important role_ in the operation of the ScaleManager. 
 *
 * The Display canvas - or Game size, depending {@link #scaleMode} - is updated to best utilize the Parent size.
@@ -288,7 +288,7 @@ Phaser.ScaleManager = function (game, width, height) {
     * If `targetElement` is _not_ the same element as {@link #fullScreenTarget}:
     * - After initialization the Display canvas is moved onto the `targetElement` for
     *   the duration of the fullscreen mode, and restored to it's original DOM location when fullscreen is exited.
-    * - The `targetElement` is moved/reparanted within the DOM and may have its CSS styles updated.
+    * - The `targetElement` is moved/re-parented within the DOM and may have its CSS styles updated.
     *
     * The behavior of a pre-assigned target element is covered in {@link Phaser.ScaleManager#fullScreenTarget fullScreenTarget}.
     *
@@ -432,7 +432,7 @@ Phaser.ScaleManager = function (game, width, height) {
     * Various compatibility settings.
     * A value of "(auto)" indicates the setting is configured based on device and runtime information.
     *
-    * A {@link #refresh} may need to be peformed after making changes.
+    * A {@link #refresh} may need to be performed after making changes.
     *
     * @protected
     * 
@@ -444,7 +444,7 @@ Phaser.ScaleManager = function (game, width, height) {
     *
     * @property {?Phaser.Point} [scrollTo=(auto)] - If specified the window will be scrolled to this position on every refresh.
     *
-    * @property {boolean} [forceMinimumDocumentHeight=false] - If enabled the document elements minimum height is explicity set on updates.
+    * @property {boolean} [forceMinimumDocumentHeight=false] - If enabled the document elements minimum height is explicitly set on updates.
     *    The height set varies by device and may either be the height of the window or the viewport.
     *
     * @property {boolean} [canExpandParent=true] - If enabled then SHOW_ALL and USER_SCALE modes can try and expand the parent element. It may be necessary for the parent element to impose CSS width/height restrictions.
@@ -479,7 +479,7 @@ Phaser.ScaleManager = function (game, width, height) {
     this._fullScreenScaleMode = Phaser.ScaleManager.NO_SCALE;
 
     /**
-    * If the parent container of the Game canvas is the browser window itself (ie. document.body),
+    * If the parent container of the Game canvas is the browser window itself (i.e. document.body),
     * rather than another div, this should set to `true`.
     *
     * The {@link #parentNode} property is generally ignored while this is in effect.
@@ -766,6 +766,8 @@ Phaser.ScaleManager.prototype = {
         // Don't use updateOrientationState so events are not fired
         this.screenOrientation = this.dom.getScreenOrientation(this.compatibility.orientationFallback);
 
+        this.grid = new Phaser.FlexGrid(this, this.width, this.height);
+
     },
 
     /**
@@ -875,8 +877,6 @@ Phaser.ScaleManager.prototype = {
 
         this._gameSize.setTo(0, 0, newWidth, newHeight);
 
-        this.grid = new Phaser.FlexGrid(this, newWidth, newHeight);
-
         this.updateDimensions(newWidth, newHeight, false);
 
     },
@@ -977,7 +977,7 @@ Phaser.ScaleManager.prototype = {
     *
     * This also triggers updates on {@link #grid} (FlexGrid) and, if in a RESIZE mode, `game.state` (StateManager).
     *
-    * @method Phaser.ScaleMager#signalSizeChange
+    * @method Phaser.ScaleManager#signalSizeChange
     * @private
     */
     signalSizeChange: function () {

src/sound/SoundManager.js

@@ -236,7 +236,15 @@ Phaser.SoundManager.prototype = {
             this._unlockSource = this.context.createBufferSource();
             this._unlockSource.buffer = buffer;
             this._unlockSource.connect(this.context.destination);
-            this._unlockSource.noteOn(0);
+
+            if (typeof this._unlockSource.start === 'undefined')
+            {
+                this._unlockSource.noteOn(0);
+            }
+            else
+            {
+                this._unlockSource.start(0);
+            }
         }
 
     },