Skip to content

Commit

Permalink
1.1.1 release with fix for Phaser.AUTO and a new text example.
Browse files Browse the repository at this point in the history
  • Loading branch information
photonstorm committed Oct 26, 2013
1 parent 2787ed1 commit 9261160
Show file tree
Hide file tree
Showing 9 changed files with 63 additions and 37 deletions.
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Phaser 1.1

Phaser is a fast, free and fun open source game framework for making desktop and mobile browser HTML5 games. It uses [Pixi.js](https://github.com/GoodBoyDigital/pixi.js/) internally for fast 2D Canvas and WebGL rendering.

Version: 1.1.2 - Released: -in development-
Version: 1.1.1 - Released: October 26th

By Richard Davey, [Photon Storm](http://www.photonstorm.com)

Expand Down Expand Up @@ -37,10 +37,10 @@ Phaser is everything we ever wanted from an HTML5 game framework. It powers all
Change Log
----------

Version 1.1.2


Version 1.1.1

* Quick patch to get Phaser.AUTO working again on Firefox.
* Any key added via addKey now automatically adds it to the capture list.

Version 1.1

Expand Down
23 changes: 9 additions & 14 deletions build/phaser.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*
* Phaser - http://www.phaser.io
*
* v1.1.0 - Built at: Fri Oct 25 2013 18:25:28
* v1.1.1 - Built at: Sat Oct 26 2013 19:10:41
*
* By Richard Davey http://www.photonstorm.com @photonstorm
*
Expand Down Expand Up @@ -57,7 +57,7 @@ var PIXI = PIXI || {};
*/
var Phaser = Phaser || {

VERSION: '1.1.0',
VERSION: '1.1.1',
GAMES: [],
AUTO: 0,
CANVAS: 1,
Expand Down Expand Up @@ -11271,21 +11271,13 @@ Phaser.Game.prototype = {

if (this.renderType == Phaser.CANVAS)
{
console.log('%cPhaser ' + Phaser.VERSION + ' initialized. Rendering to Canvas', 'color: #ffff33; background: #000000');
console.log('%cPhaser initialized. Rendering to Canvas.', 'color: #ffff33; background: #000000');
}
else
{
console.log('%cPhaser ' + Phaser.VERSION + ' initialized. Rendering to WebGL', 'color: #ffff33; background: #000000');
console.log('%cPhaser initialized. Rendering to WebGL.', 'color: #ffff33; background: #000000');
}

var pos = Phaser.VERSION.indexOf('-');
var versionQualifier = (pos >= 0) ? Phaser.VERSION.substr(pos + 1) : null;
if (versionQualifier)
{
var article = ['a', 'e', 'i', 'o', 'u', 'y'].indexOf(versionQualifier.charAt(0)) >= 0 ? 'an' : 'a';
console.warn('You are using %s %s version of Phaser. Some things may not work.', article, versionQualifier);
}

this.isRunning = true;
this._loadComplete = false;

Expand Down Expand Up @@ -12543,6 +12535,9 @@ Phaser.Keyboard.prototype = {
addKey: function (keycode) {

this._hotkeys[keycode] = new Phaser.Key(this.game, keycode);

this.addKeyCapture(keycode);

return this._hotkeys[keycode];

},
Expand Down Expand Up @@ -19059,7 +19054,7 @@ Phaser.Device.prototype = {
this.fileSystem = !!window['requestFileSystem'];
this.webGL = ( function () { try { var canvas = document.createElement( 'canvas' ); return !! window.WebGLRenderingContext && ( canvas.getContext( 'webgl' ) || canvas.getContext( 'experimental-webgl' ) ); } catch( e ) { return false; } } )();

if (this.webGL === null)
if (this.webGL === null || this.webGL === false)
{
this.webGL = false;
}
Expand Down Expand Up @@ -35048,4 +35043,4 @@ PIXI.WebGLBatch.prototype.update = function()
}
}
return Phaser;
});
});
16 changes: 8 additions & 8 deletions build/phaser.min.js

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions examples/_site/examples.json
Original file line number Diff line number Diff line change
Expand Up @@ -535,6 +535,10 @@
{
"file": "text+stroke.js",
"title": "text stroke"
},
{
"file": "update+text.js",
"title": "update text"
}
],
"tile sprites": [
Expand Down
35 changes: 35 additions & 0 deletions examples/text/update text.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
// Example created by Arlefreak (https://github.com/Arlefreak)

var game = new Phaser.Game(800, 600, Phaser.CANVAS, 'phaser-example', { create: create, update: update });

var text;
var count;

function create() {

count = 0;

text = game.add.text(game.world.centerX, game.world.centerY, "- You have clicked -\n0 times !", {
font: "65px Arial",
fill: "#ff0044",
align: "center"
});

text.anchor.setTo(0.5, 0.5);

}

function update() {

game.input.onDown.addOnce(updateText, this);

}


function updateText() {

count++;

text.setText("- You have clicked -\n" + count + " times !");

}
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Phaser",
"version": "1.1.0",
"version": "1.1.1",
"description": "HTML5 game framework",
"repository": {
"type": "git",
Expand Down
2 changes: 1 addition & 1 deletion src/IntroDocs.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
*
* Phaser - http://www.phaser.io
*
* v1.1 - Released October 25th 2013.
* v1.1.1 - Released October 26th 2013.
*
* By Richard Davey http://www.photonstorm.com @photonstorm
*
Expand Down
8 changes: 0 additions & 8 deletions src/core/Game.js
Original file line number Diff line number Diff line change
Expand Up @@ -315,14 +315,6 @@ Phaser.Game.prototype = {
console.log('%cPhaser initialized. Rendering to WebGL.', 'color: #ffff33; background: #000000');
}

var pos = Phaser.VERSION.indexOf('-');
var versionQualifier = (pos >= 0) ? Phaser.VERSION.substr(pos + 1) : null;
if (versionQualifier)
{
var article = ['a', 'e', 'i', 'o', 'u', 'y'].indexOf(versionQualifier.charAt(0)) >= 0 ? 'an' : 'a';
console.warn('You are using %s %s version of Phaser. Some things may not work.', article, versionQualifier);
}

this.isRunning = true;
this._loadComplete = false;

Expand Down
2 changes: 1 addition & 1 deletion src/system/Device.js
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ Phaser.Device.prototype = {
this.fileSystem = !!window['requestFileSystem'];
this.webGL = ( function () { try { var canvas = document.createElement( 'canvas' ); return !! window.WebGLRenderingContext && ( canvas.getContext( 'webgl' ) || canvas.getContext( 'experimental-webgl' ) ); } catch( e ) { return false; } } )();

if (this.webGL === null)
if (this.webGL === null || this.webGL === false)
{
this.webGL = false;
}
Expand Down

0 comments on commit 9261160

Please sign in to comment.