Skip to content

Commit

Permalink
Merge pull request #661 from photonstorm/release/v2.15.0
Browse files Browse the repository at this point in the history
Release Phaser CE v2.15.0
  • Loading branch information
photonstorm committed Mar 10, 2020
2 parents d7ae85a + 1d35ca9 commit 7c9edad
Show file tree
Hide file tree
Showing 222 changed files with 8,511 additions and 8,530 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
@@ -1,6 +1,6 @@
# Change Log

## Unreleased
## Version 2.15.0 - 6 Mar 2020

### API Changes

Expand Down
16 changes: 8 additions & 8 deletions README.md
Expand Up @@ -6,7 +6,7 @@ Phaser CE is a fast, free, and fun open source HTML5 game framework. It uses a c

Phaser v2 was built and maintained by [Photon Storm](http://www.photonstorm.com) and turned over to the community (as Phaser CE) in November 2016. [Phaser v3](http://phaser.io/phaser3) is in active development.

The [current Phaser CE release is 2.14.0](https://github.com/photonstorm/phaser-ce/releases/tag/v2.14.0).
The [current Phaser CE release is 2.15.0](https://github.com/photonstorm/phaser-ce/releases/tag/v2.15.0).

- **Visit:** The [Phaser website](http://phaser.io) and follow on [Twitter](https://twitter.com/photonstorm) (#[phaserjs](https://twitter.com/hashtag/phaserjs))
- **Learn:** [API Docs](https://photonstorm.github.io/phaser-ce/), [Support Forum][forum] and [StackOverflow](https://stackoverflow.com/questions/tagged/phaser-framework)
Expand Down Expand Up @@ -88,16 +88,16 @@ Please see additional steps for [Browserify/CommonJS](#browserify) and [Webpack]
[Phaser CE is on jsDelivr](http://www.jsdelivr.com/projects/phaser-ce), a "super-fast CDN for developers". Include the following in your html:

```html
<script src="//cdn.jsdelivr.net/npm/phaser-ce@2.14.0/build/phaser.js"></script>
<script src="//cdn.jsdelivr.net/npm/phaser-ce@2.15.0/build/phaser.js"></script>
```

or the minified version:

```html
<script src="//cdn.jsdelivr.net/npm/phaser-ce@2.14.0"></script>
<script src="//cdn.jsdelivr.net/npm/phaser-ce@2.15.0"></script>
```

[Custom builds](https://cdn.jsdelivr.net/npm/phaser-ce@2.14.0/build/custom/) are available too.
[Custom builds](https://cdn.jsdelivr.net/npm/phaser-ce@2.15.0/build/custom/) are available too.

<a name="getting-started"></a>

Expand Down Expand Up @@ -312,10 +312,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-ce/releases/download/v2.14.0/phaser.js
[get-minjs]: https://github.com/photonstorm/phaser-ce/releases/download/v2.14.0/phaser.min.js
[get-zip]: https://github.com/photonstorm/phaser-ce/archive/v2.14.0.zip
[get-tgz]: https://github.com/photonstorm/phaser-ce/archive/v2.14.0.tar.gz
[get-js]: https://github.com/photonstorm/phaser-ce/releases/download/v2.15.0/phaser.js
[get-minjs]: https://github.com/photonstorm/phaser-ce/releases/download/v2.15.0/phaser.min.js
[get-zip]: https://github.com/photonstorm/phaser-ce/archive/v2.15.0.zip
[get-tgz]: https://github.com/photonstorm/phaser-ce/archive/v2.15.0.tar.gz
[clone-http]: https://github.com/photonstorm/phaser.git
[clone-ssh]: ssh://git@github.com:photonstorm/phaser.git
[clone-svn]: https://github.com/photonstorm/phaser
Expand Down
2 changes: 1 addition & 1 deletion build/custom/creature.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build/custom/p2.min.js

Large diffs are not rendered by default.

51 changes: 21 additions & 30 deletions build/custom/phaser-arcade-physics.js
Expand Up @@ -7,7 +7,7 @@
*
* Phaser - http://phaser.io
*
* v2.14.0 "2020-01-19" - Built: Sun Jan 19 2020 13:12:10
* v2.15.0 "2020-03-06" - Built: Fri Mar 06 2020 12:24:43
*
* By Richard Davey http://www.photonstorm.com @photonstorm
*
Expand Down Expand Up @@ -5007,6 +5007,15 @@ PIXI.WebGLSpriteBatch.prototype.end = function ()
PIXI.WebGLSpriteBatch.prototype.render = function (sprite, matrix)
{
var texture = sprite.texture;
var baseTexture = texture.baseTexture;
var gl = this.gl;
if (PIXI.WebGLRenderer.textureArray[baseTexture.textureIndex] != baseTexture) // eslint-disable-line eqeqeq
{
this.flush();
gl.activeTexture(gl.TEXTURE0 + baseTexture.textureIndex);
gl.bindTexture(gl.TEXTURE_2D, baseTexture._glTextures[gl.id]);
PIXI.WebGLRenderer.textureArray[baseTexture.textureIndex] = baseTexture;
}

// They provided an alternative rendering matrix, so use it
var wt = sprite.worldTransform;
Expand Down Expand Up @@ -5179,7 +5188,16 @@ PIXI.WebGLSpriteBatch.prototype.render = function (sprite, matrix)
PIXI.WebGLSpriteBatch.prototype.renderTilingSprite = function (sprite)
{
var texture = sprite.tilingTexture;
var baseTexture = texture.baseTexture;
var gl = this.gl;
var textureIndex = sprite.texture.baseTexture.textureIndex;
if (PIXI.WebGLRenderer.textureArray[textureIndex] != baseTexture) // eslint-disable-line eqeqeq
{
this.flush();
gl.activeTexture(gl.TEXTURE0 + textureIndex);
gl.bindTexture(gl.TEXTURE_2D, baseTexture._glTextures[gl.id]);
PIXI.WebGLRenderer.textureArray[textureIndex] = baseTexture;
}

// check texture..
if (this.currentBatchSize >= this.size)
Expand Down Expand Up @@ -5411,7 +5429,7 @@ PIXI.WebGLSpriteBatch.prototype.flush = function ()
}

//
if ((currentBaseTexture !== nextTexture && !skip) ||
if (/* (currentBaseTexture !== nextTexture && !skip) || */
blendSwap ||
shaderSwap)
{
Expand Down Expand Up @@ -7836,7 +7854,7 @@ var Phaser = Phaser || { // jshint ignore:line
* @constant Phaser.VERSION
* @type {string}
*/
VERSION: '2.14.0',
VERSION: '2.15.0',

/**
* An array of Phaser game instances.
Expand Down Expand Up @@ -33996,13 +34014,6 @@ Phaser.Component.BringToTop.prototype.moveDown = function ()
*/
Phaser.Component.Core = function () {};

/**
* @property {boolean} skipTypeChecks - Skip type checks in {@link #init}.
* @static
* @default
*/
Phaser.Component.Core.skipTypeChecks = false;

/**
* Installs / registers mixin components.
*
Expand Down Expand Up @@ -34047,26 +34058,6 @@ Phaser.Component.Core.install = function (components)
Phaser.Component.Core.init = function (game, x, y, key, frame)
{

if (!Phaser.Component.Core.skipTypeChecks)
{
if (!(game instanceof Phaser.Game))
{
throw new Error('The value passed as the `game` argument (' + game + ') is not an instance of Phaser.Game.');
}

if (typeof x !== 'number')
{
console.warn('The `x` argument value (%s) should be a number.', x);
x = 0; // This would be done implicitly in position.set().
}

if (typeof y !== 'number')
{
console.warn('The `y` argument value (%s) should be a number.', y);
y = 0; // This would be done implicitly in position.set().
}
}

this.game = game;
this.key = key;
this.data = {};
Expand Down
2 changes: 1 addition & 1 deletion build/custom/phaser-arcade-physics.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions build/custom/phaser-arcade-physics.min.js

Large diffs are not rendered by default.

31 changes: 2 additions & 29 deletions build/custom/phaser-creature.js
Expand Up @@ -7,7 +7,7 @@
*
* Phaser - http://phaser.io
*
* v2.14.0 "2020-01-19" - Built: Sun Jan 19 2020 13:12:26
* v2.15.0 "2020-03-06" - Built: Fri Mar 06 2020 12:25:00
*
* By Richard Davey http://www.photonstorm.com @photonstorm
*
Expand Down Expand Up @@ -53,7 +53,7 @@ var Phaser = Phaser || { // jshint ignore:line
* @constant Phaser.VERSION
* @type {string}
*/
VERSION: '2.14.0',
VERSION: '2.15.0',

/**
* An array of Phaser game instances.
Expand Down Expand Up @@ -26213,13 +26213,6 @@ Phaser.Component.BringToTop.prototype.moveDown = function ()
*/
Phaser.Component.Core = function () {};

/**
* @property {boolean} skipTypeChecks - Skip type checks in {@link #init}.
* @static
* @default
*/
Phaser.Component.Core.skipTypeChecks = false;

/**
* Installs / registers mixin components.
*
Expand Down Expand Up @@ -26264,26 +26257,6 @@ Phaser.Component.Core.install = function (components)
Phaser.Component.Core.init = function (game, x, y, key, frame)
{

if (!Phaser.Component.Core.skipTypeChecks)
{
if (!(game instanceof Phaser.Game))
{
throw new Error('The value passed as the `game` argument (' + game + ') is not an instance of Phaser.Game.');
}

if (typeof x !== 'number')
{
console.warn('The `x` argument value (%s) should be a number.', x);
x = 0; // This would be done implicitly in position.set().
}

if (typeof y !== 'number')
{
console.warn('The `y` argument value (%s) should be a number.', y);
y = 0; // This would be done implicitly in position.set().
}
}

this.game = game;
this.key = key;
this.data = {};
Expand Down
2 changes: 1 addition & 1 deletion build/custom/phaser-creature.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions build/custom/phaser-creature.min.js

Large diffs are not rendered by default.

51 changes: 21 additions & 30 deletions build/custom/phaser-minimum.js
Expand Up @@ -7,7 +7,7 @@
*
* Phaser - http://phaser.io
*
* v2.14.0 "2020-01-19" - Built: Sun Jan 19 2020 13:12:17
* v2.15.0 "2020-03-06" - Built: Fri Mar 06 2020 12:24:51
*
* By Richard Davey http://www.photonstorm.com @photonstorm
*
Expand Down Expand Up @@ -5007,6 +5007,15 @@ PIXI.WebGLSpriteBatch.prototype.end = function ()
PIXI.WebGLSpriteBatch.prototype.render = function (sprite, matrix)
{
var texture = sprite.texture;
var baseTexture = texture.baseTexture;
var gl = this.gl;
if (PIXI.WebGLRenderer.textureArray[baseTexture.textureIndex] != baseTexture) // eslint-disable-line eqeqeq
{
this.flush();
gl.activeTexture(gl.TEXTURE0 + baseTexture.textureIndex);
gl.bindTexture(gl.TEXTURE_2D, baseTexture._glTextures[gl.id]);
PIXI.WebGLRenderer.textureArray[baseTexture.textureIndex] = baseTexture;
}

// They provided an alternative rendering matrix, so use it
var wt = sprite.worldTransform;
Expand Down Expand Up @@ -5179,7 +5188,16 @@ PIXI.WebGLSpriteBatch.prototype.render = function (sprite, matrix)
PIXI.WebGLSpriteBatch.prototype.renderTilingSprite = function (sprite)
{
var texture = sprite.tilingTexture;
var baseTexture = texture.baseTexture;
var gl = this.gl;
var textureIndex = sprite.texture.baseTexture.textureIndex;
if (PIXI.WebGLRenderer.textureArray[textureIndex] != baseTexture) // eslint-disable-line eqeqeq
{
this.flush();
gl.activeTexture(gl.TEXTURE0 + textureIndex);
gl.bindTexture(gl.TEXTURE_2D, baseTexture._glTextures[gl.id]);
PIXI.WebGLRenderer.textureArray[textureIndex] = baseTexture;
}

// check texture..
if (this.currentBatchSize >= this.size)
Expand Down Expand Up @@ -5411,7 +5429,7 @@ PIXI.WebGLSpriteBatch.prototype.flush = function ()
}

//
if ((currentBaseTexture !== nextTexture && !skip) ||
if (/* (currentBaseTexture !== nextTexture && !skip) || */
blendSwap ||
shaderSwap)
{
Expand Down Expand Up @@ -7836,7 +7854,7 @@ var Phaser = Phaser || { // jshint ignore:line
* @constant Phaser.VERSION
* @type {string}
*/
VERSION: '2.14.0',
VERSION: '2.15.0',

/**
* An array of Phaser game instances.
Expand Down Expand Up @@ -31295,13 +31313,6 @@ Phaser.Component.BringToTop.prototype.moveDown = function ()
*/
Phaser.Component.Core = function () {};

/**
* @property {boolean} skipTypeChecks - Skip type checks in {@link #init}.
* @static
* @default
*/
Phaser.Component.Core.skipTypeChecks = false;

/**
* Installs / registers mixin components.
*
Expand Down Expand Up @@ -31346,26 +31357,6 @@ Phaser.Component.Core.install = function (components)
Phaser.Component.Core.init = function (game, x, y, key, frame)
{

if (!Phaser.Component.Core.skipTypeChecks)
{
if (!(game instanceof Phaser.Game))
{
throw new Error('The value passed as the `game` argument (' + game + ') is not an instance of Phaser.Game.');
}

if (typeof x !== 'number')
{
console.warn('The `x` argument value (%s) should be a number.', x);
x = 0; // This would be done implicitly in position.set().
}

if (typeof y !== 'number')
{
console.warn('The `y` argument value (%s) should be a number.', y);
y = 0; // This would be done implicitly in position.set().
}
}

this.game = game;
this.key = key;
this.data = {};
Expand Down
2 changes: 1 addition & 1 deletion build/custom/phaser-minimum.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions build/custom/phaser-minimum.min.js

Large diffs are not rendered by default.

0 comments on commit 7c9edad

Please sign in to comment.