Skip to content

Commit 6e82760

Browse files
committed
Merge branch 'master' of https://github.com/photonstorm/phaser
2 parents c1d482b + 432a03e commit 6e82760

3 files changed

Lines changed: 8 additions & 0 deletions

File tree

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
* The RandomDataGenerator `sign` property had a method collision. Fix #3323 (thanks @vinerz and @samme)
3939
* In Arcade Physics World if you collided a group with itself it would call a missing method (`collideGroupVsSelf`), it now calls `collideGroupVsGroup` correctly (thanks @patrickgalbraith)
4040
* The HTML5 Sound Manager would unlock the Sound API on a touch event but only if the audio files were loaded in the first Scene, if they were loaded in a subsequent Scene the audio system would never unlock. It now unlocks only if there are audio files in the cache. Fix #3311 (thanks @chancezeus)
41+
* The Text.lineSpacing value was not taken into account when rendering the Text. Fix #3215 (thanks @sftsk)
4142

4243
### Updates
4344

@@ -53,6 +54,7 @@
5354
* ScenePlugin.swapPosition now allows you to use it to swap the positions of any two Scenes. Before the change it only allowed you to swap the position of the calling Scene and another one, but a new optional `keyB` argument opens this up.
5455
* The SceneManager no longer renders a Scene unless it is visible AND either running or paused. This now skips Scenes that are in an `init` state.
5556
* The Keyboard Manager will now no longer emit `keydown` events if you keep holding a key down. Fix #3239 (thanks @squaresun)
57+
* The SceneManager now employs a new queue for all pending Scenes, creating them and booting them in strict sequence. This should prevent errors where Scenes were unable to reference other Scenes further down the boot list in their create functions. Fix #3314 (thanks @max1701 @rblopes)
5658
* Phaser is now running Travis CI build testing again (thanks @vpmedia)
5759
* Documentation updates: thanks to @melissaelopez @samme @jblang94
5860

src/gameobjects/text/static/Text.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,11 @@ var Text = new Class({
200200
{
201201
this.setPadding(style.padding);
202202
}
203+
204+
if (style && style.lineSpacing)
205+
{
206+
this._lineSpacing = style.lineSpacing;
207+
}
203208

204209
this.setText(text);
205210

src/scene/SceneManager.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@ var SceneManager = new Class({
127127
* Internal first-time Scene boot handler.
128128
*
129129
* @method Phaser.Scenes.SceneManager#bootQueue
130+
* @private
130131
* @since 3.2.0
131132
*/
132133
bootQueue: function ()

0 commit comments

Comments
 (0)