diff --git a/README.md b/README.md index ef416fd3..3226c481 100644 --- a/README.md +++ b/README.md @@ -74,6 +74,8 @@ Version 1.1.3 - in build * Fixed: ArcadePhysics.separateTile wasn't returning the value, so the custom process callback wasn't getting called (thanks flameiguana) * Fixed: StageScaleMode.forceOrientation now correctly stores the forcePortrait value (thanks haden) * Fixed: Fixes to Math and Loader (thanks theJare) +* Fixed: Tween - isRunning not reset when non-looped tween completes (thanks crazysam + kevinthompson) +* Fixed: Math.normalizeAngle and Math.wrapAngle (thanks theJare) * Updated: ArcadePhysics.updateMotion applies the dt to the velocity calculations as well as position now (thanks jcs) * Updated: RequestAnimationFrame now retains the callbackID which is passed to cancelRequestAnimationFrame. @@ -85,7 +87,7 @@ Version 1.1.3 - in build * Updated: Lots of documentation tweaks across various files such as Pointer, Sound and Color. * Updated: If you specify 'null' as a Group parent it will now revert to using the World as the parent (before only 'undefined' worked) * Updated: Skip preupdate/update for PIXI hierarchies in which an ancestor doesn't exist (thanks cocoademon) - +* Updated: Loader.audio can now accept either an array of URL strings or a single URL string (thanks crazysam + kevinthompson) diff --git a/src/loader/Loader.js b/src/loader/Loader.js index 44c1f80a..34cca2e7 100644 --- a/src/loader/Loader.js +++ b/src/loader/Loader.js @@ -332,7 +332,7 @@ Phaser.Loader.prototype = { * * @method Phaser.Loader#audio * @param {string} key - Unique asset key of the audio file. - * @param {Array} urls - An array containing the URLs of the audio files, i.e.: [ 'jump.mp3', 'jump.ogg', 'jump.m4a' ]. + * @param {Array|string} urls - An array containing the URLs of the audio files, i.e.: [ 'jump.mp3', 'jump.ogg', 'jump.m4a' ] or a single string containing just one URL. * @param {boolean} autoDecode - When using Web Audio the audio files can either be decoded at load time or run-time. They can't be played until they are decoded, but this let's you control when that happens. Decoding is a non-blocking async process. */ audio: function (key, urls, autoDecode) { @@ -773,13 +773,15 @@ Phaser.Loader.prototype = { /** * Private method ONLY used by loader. * @method Phaser.Loader#getAudioURL - * @param {Description} urls - Description. + * @param {array|string} urls - Either an array of audio file URLs or a string containing a single URL path. * @private */ getAudioURL: function (urls) { var extension; + if (typeof urls === 'string') { urls = [urls]; } + for (var i = 0; i < urls.length; i++) { extension = urls[i].toLowerCase(); diff --git a/src/tween/Tween.js b/src/tween/Tween.js index c89289f5..d15322bb 100644 --- a/src/tween/Tween.js +++ b/src/tween/Tween.js @@ -585,6 +585,7 @@ Phaser.Tween.prototype = { } else { + this.isRunning = false; this.onComplete.dispatch(this._object); if ( this._onCompleteCallback !== null ) {