Skip to content

Commit 59ec8de

Browse files
committed
Merge branch 'master' of https://github.com/photonstorm/phaser
2 parents 305ffdf + 4cd2713 commit 59ec8de

4 files changed

Lines changed: 26 additions & 26 deletions

File tree

src/actions/PlayAnimation.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@
55
*/
66

77
/**
8-
* [description]
8+
* Play an animation with the given key, starting at the given startFrame on all Game Objects in items.
99
*
1010
* @function Phaser.Actions.PlayAnimation
1111
* @since 3.0.0
1212
*
1313
* @generic {Phaser.GameObjects.GameObject[]} G - [items,$return]
1414
*
1515
* @param {(array|Phaser.GameObjects.GameObject[])} items - An array of Game Objects. The contents of this array are updated by this Action.
16-
* @param {string} key - [description]
17-
* @param {(string|integer)} [startFrame] - [description]
16+
* @param {string} key - The name of the animation to play.
17+
* @param {(string|integer)} [startFrame] - The starting frame of the animation with the given key.
1818
*
1919
* @return {(array|Phaser.GameObjects.GameObject[])} The array of Game Objects that was passed to this Action.
2020
*/

src/geom/line/Line.js

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ var Vector2 = require('../../math/Vector2');
1919
* @constructor
2020
* @since 3.0.0
2121
*
22-
* @param {number} [x1=0] - [description]
23-
* @param {number} [y1=0] - [description]
24-
* @param {number} [x2=0] - [description]
25-
* @param {number} [y2=0] - [description]
22+
* @param {number} [x1=0] - The x coordinate of the lines starting point.
23+
* @param {number} [y1=0] - The y coordinate of the lines starting point.
24+
* @param {number} [x2=0] - The x coordinate of the lines ending point.
25+
* @param {number} [y2=0] - The y coordinate of the lines ending point.
2626
*/
2727
var Line = new Class({
2828

@@ -36,7 +36,7 @@ var Line = new Class({
3636
if (y2 === undefined) { y2 = 0; }
3737

3838
/**
39-
* [description]
39+
* The x coordinate of the lines starting point.
4040
*
4141
* @name Phaser.Geom.Line#x1
4242
* @type {number}
@@ -45,7 +45,7 @@ var Line = new Class({
4545
this.x1 = x1;
4646

4747
/**
48-
* [description]
48+
* The y coordinate of the lines starting point.
4949
*
5050
* @name Phaser.Geom.Line#y1
5151
* @type {number}
@@ -54,7 +54,7 @@ var Line = new Class({
5454
this.y1 = y1;
5555

5656
/**
57-
* [description]
57+
* The x coordinate of the lines ending point.
5858
*
5959
* @name Phaser.Geom.Line#x2
6060
* @type {number}
@@ -63,7 +63,7 @@ var Line = new Class({
6363
this.x2 = x2;
6464

6565
/**
66-
* [description]
66+
* The y coordinate of the lines ending point.
6767
*
6868
* @name Phaser.Geom.Line#y2
6969
* @type {number}
@@ -83,7 +83,7 @@ var Line = new Class({
8383
* @param {float} position - [description]
8484
* @param {(Phaser.Geom.Point|object)} [output] - [description]
8585
*
86-
* @return {(Phaser.Geom.Point|object)} A Point, or point-like object, containing the coordinates of the point around the ellipse.
86+
* @return {(Phaser.Geom.Point|object)} A Point, or point-like object, containing the coordinates of the point on the line.
8787
*/
8888
getPoint: function (position, output)
8989
{
@@ -110,32 +110,32 @@ var Line = new Class({
110110
},
111111

112112
/**
113-
* [description]
113+
* Get a random Point on the Line.
114114
*
115115
* @method Phaser.Geom.Line#getRandomPoint
116116
* @since 3.0.0
117117
*
118118
* @generic {Phaser.Geom.Point} O - [point,$return]
119119
*
120-
* @param {(Phaser.Geom.Point|object)} [point] - [description]
120+
* @param {(Phaser.Geom.Point|object)} [point] - An instance of a Point to be modified.
121121
*
122-
* @return {Phaser.Geom.Point} [description]
122+
* @return {Phaser.Geom.Point} A random Point on the Line.
123123
*/
124124
getRandomPoint: function (point)
125125
{
126126
return Random(this, point);
127127
},
128128

129129
/**
130-
* [description]
130+
* Set new coordinates for the line endpoints.
131131
*
132132
* @method Phaser.Geom.Line#setTo
133133
* @since 3.0.0
134134
*
135-
* @param {number} [x1=0] - [description]
136-
* @param {number} [y1=0] - [description]
137-
* @param {number} [x2=0] - [description]
138-
* @param {number} [y2=0] - [description]
135+
* @param {number} [x1=0] - The x coordinate of the lines starting point.
136+
* @param {number} [y1=0] - The y coordinate of the lines starting point.
137+
* @param {number} [x2=0] - The x coordinate of the lines ending point.
138+
* @param {number} [y2=0] - The y coordinate of the lines ending point.
139139
*
140140
* @return {Phaser.Geom.Line} This Line object.
141141
*/

src/geom/line/Random.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@
77
var Point = require('../point/Point');
88

99
/**
10-
* [description]
10+
* Returns a random point on a given Line.
1111
*
1212
* @function Phaser.Geom.Line.Random
1313
* @since 3.0.0
1414
*
1515
* @generic {Phaser.Geom.Point} O - [out,$return]
1616
*
17-
* @param {Phaser.Geom.Line} line - [description]
18-
* @param {(Phaser.Geom.Point|object)} [out] - [description]
17+
* @param {Phaser.Geom.Line} line - The Line to calculate the random Point on.
18+
* @param {(Phaser.Geom.Point|object)} [out] - An instance of a Point to be modified.
1919
*
20-
* @return {(Phaser.Geom.Point|object)} [description]
20+
* @return {(Phaser.Geom.Point|object)} A random Point on the Line.
2121
*/
2222
var Random = function (line, out)
2323
{

src/geom/point/Point.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ var Class = require('../../utils/Class');
88

99
/**
1010
* @classdesc
11-
* [description]
11+
* Defines a Point in 2D space, with an x and y component.
1212
*
1313
* @class Point
1414
* @memberOf Phaser.Geom
@@ -49,7 +49,7 @@ var Point = new Class({
4949
},
5050

5151
/**
52-
* [description]
52+
* Set the x and y coordinates of the point to the given values.
5353
*
5454
* @method Phaser.Geom.Point#setTo
5555
* @since 3.0.0

0 commit comments

Comments
 (0)