mirror of
https://github.com/photonstorm/phaser
synced 2024-11-14 17:07:43 +00:00
Merge branch 'master' of https://github.com/photonstorm/phaser
This commit is contained in:
commit
9676205403
4 changed files with 4 additions and 4 deletions
|
@ -242,7 +242,7 @@ var DataManager = new Class({
|
|||
{
|
||||
if (overwrite || (!overwrite && !this.has(key)))
|
||||
{
|
||||
this.list[key] = data;
|
||||
this.list[key] = data[key];
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -69,7 +69,7 @@ var Button = new Class({
|
|||
* @default 0
|
||||
* @since 3.0.0
|
||||
*/
|
||||
this.threshold = 0;
|
||||
this.threshold = 1;
|
||||
|
||||
/**
|
||||
* Is the Button being pressed down or not?
|
||||
|
|
|
@ -1293,7 +1293,7 @@ var Body = new Class({
|
|||
|
||||
if (this.isCircle)
|
||||
{
|
||||
graphic.strokeCircle(x, y, this.radius);
|
||||
graphic.strokeCircle(x, y, this.width / 2);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
|
@ -655,7 +655,7 @@ var SceneManager = new Class({
|
|||
|
||||
// Extract callbacks
|
||||
|
||||
var defaults = [ 'init', 'preload', 'create', 'update', 'render', 'shutdown', 'destroy' ];
|
||||
var defaults = [ 'init', 'preload', 'create', 'update', 'render' ];
|
||||
|
||||
for (var i = 0; i < defaults.length; i++)
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue