Skip to content

Commit f24204e

Browse files
committed
Merge branch 'master' of https://github.com/photonstorm/phaser
2 parents 5443f9c + 51cc10b commit f24204e

3 files changed

Lines changed: 8 additions & 8 deletions

File tree

src/gameobjects/lights/LightsManager.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -244,11 +244,11 @@ var LightsManager = new Class({
244244
* @method Phaser.GameObjects.LightsManager#addLight
245245
* @since 3.0.0
246246
*
247-
* @param {number} x - The horizontal position of the Light.
248-
* @param {number} y - The vertical position of the Light.
249-
* @param {number} radius - The radius of the Light.
250-
* @param {number} rgb - The integer RGB color of the light.
251-
* @param {number} intensity - The intensity of the Light.
247+
* @param {number} [x=0] - The horizontal position of the Light.
248+
* @param {number} [y=0] - The vertical position of the Light.
249+
* @param {number} [radius=100] - The radius of the Light.
250+
* @param {number} [rgb=0xffffff] - The integer RGB color of the light.
251+
* @param {number} [intensity=1] - The intensity of the Light.
252252
*
253253
* @return {Phaser.GameObjects.Light} The Light that was added.
254254
*/

src/physics/arcade/World.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -673,13 +673,13 @@ var World = new Class({
673673
}
674674
else
675675
{
676-
this.disableBody(child);
676+
this.disableBody(child.body);
677677
}
678678
}
679679
}
680680
else
681681
{
682-
this.disableBody(entry);
682+
this.disableBody(entry.body);
683683
}
684684
}
685685
},

src/structs/Set.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ var Set = new Class({
221221
* @genericUse {Phaser.Structs.Set.<T>} - [$return]
222222
*
223223
* @param {EachSetCallback} callback - [description]
224-
* @param {*} callbackScope - [description]
224+
* @param {*} [callbackScope] - [description]
225225
*
226226
* @return {Phaser.Structs.Set} This Set object.
227227
*/

0 commit comments

Comments
 (0)