Skip to content

Commit 9676205

Browse files
committed
Merge branch 'master' of https://github.com/photonstorm/phaser
2 parents aa8a452 + bd40c78 commit 9676205

4 files changed

Lines changed: 4 additions & 4 deletions

File tree

src/data/DataManager.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ var DataManager = new Class({
242242
{
243243
if (overwrite || (!overwrite && !this.has(key)))
244244
{
245-
this.list[key] = data;
245+
this.list[key] = data[key];
246246
}
247247
}
248248

src/input/gamepad/Button.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ var Button = new Class({
6969
* @default 0
7070
* @since 3.0.0
7171
*/
72-
this.threshold = 0;
72+
this.threshold = 1;
7373

7474
/**
7575
* Is the Button being pressed down or not?

src/physics/arcade/Body.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1293,7 +1293,7 @@ var Body = new Class({
12931293

12941294
if (this.isCircle)
12951295
{
1296-
graphic.strokeCircle(x, y, this.radius);
1296+
graphic.strokeCircle(x, y, this.width / 2);
12971297
}
12981298
else
12991299
{

src/scene/SceneManager.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -655,7 +655,7 @@ var SceneManager = new Class({
655655

656656
// Extract callbacks
657657

658-
var defaults = [ 'init', 'preload', 'create', 'update', 'render', 'shutdown', 'destroy' ];
658+
var defaults = [ 'init', 'preload', 'create', 'update', 'render' ];
659659

660660
for (var i = 0; i < defaults.length; i++)
661661
{

0 commit comments

Comments
 (0)