Skip to content

Commit 955176e

Browse files
Merge branch 'develop'
2 parents 9d9a633 + 1f16f6e commit 955176e

File tree

124 files changed

+2990
-567
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

124 files changed

+2990
-567
lines changed

CHANGELOG.MD

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,23 @@
11
# Change Log
22

3+
## v3.64.0 - Nov 10, 2023
4+
5+
* Fixes making thumbnails of single-layer prefabs.
6+
* Allows merging Import and Open buttons in the Asset Pack Entry section.
7+
* [#251](https://github.com/PhaserEditor2D/PhaserEditor2D-v3/issues/251) Fixes sprite positioning in Animations Editor.
8+
* [#209](https://github.com/PhaserEditor2D/PhaserEditor2D-v3/issues/209) Improves scene border painting.
9+
* Improves animations preview UI:
10+
- New Animation preview section.
11+
- New Animations Preview section.
12+
- Shows a preview button in the Animation Key user property.
13+
* Adds new Animation section to Sprite game objects. It is about to auto-start a sprite animation.
14+
* Adds `showBeforeDelay` to the Animations Editor.
15+
* Shows Sprite Animation blocks in the Scene Editor's Blocks view.
16+
* Aseprite animations support.
17+
* New Code Snippets scene elements.
18+
* Optimizes pooling of WEBGL contexts.
19+
* [#295](https://github.com/PhaserEditor2D/PhaserEditor2D-v3/issues/295) Fixes tilemapLayer nullable method factory.
20+
321
## v3.63.0 - Sep 30, 2023
422

523
* Opens the file given in the `openfile` URL search parameter. Like in `?openfile=some/file`.

design/aseprite/aseprite.png

778 Bytes
Loading

design/texture-packer/phasereditor2d.resources/phasereditor2d.resources@1x.tps

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,7 @@
183183
<key type="filename">x1/dark/align-top.png</key>
184184
<key type="filename">x1/dark/angle.png</key>
185185
<key type="filename">x1/dark/animations.png</key>
186+
<key type="filename">x1/dark/aseprite.png</key>
186187
<key type="filename">x1/dark/asset-pack.png</key>
187188
<key type="filename">x1/dark/bitmapfont-type.png</key>
188189
<key type="filename">x1/dark/blocks.png</key>
@@ -246,6 +247,7 @@
246247
<key type="filename">x1/light/align-top.png</key>
247248
<key type="filename">x1/light/angle.png</key>
248249
<key type="filename">x1/light/animations.png</key>
250+
<key type="filename">x1/light/aseprite.png</key>
249251
<key type="filename">x1/light/asset-pack.png</key>
250252
<key type="filename">x1/light/bitmapfont-type.png</key>
251253
<key type="filename">x1/light/blocks.png</key>

design/texture-packer/phasereditor2d.resources/phasereditor2d.resources@2x.tps

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,7 @@
183183
<key type="filename">x2/dark/align-top@2x.png</key>
184184
<key type="filename">x2/dark/angle@2x.png</key>
185185
<key type="filename">x2/dark/animations@2x.png</key>
186+
<key type="filename">x2/dark/aseprite@2x.png</key>
186187
<key type="filename">x2/dark/asset-pack@2x.png</key>
187188
<key type="filename">x2/dark/bitmapfont-type@2x.png</key>
188189
<key type="filename">x2/dark/blocks@2x.png</key>
@@ -246,6 +247,7 @@
246247
<key type="filename">x2/light/align-top@2x.png</key>
247248
<key type="filename">x2/light/angle@2x.png</key>
248249
<key type="filename">x2/light/animations@2x.png</key>
250+
<key type="filename">x2/light/aseprite@2x.png</key>
249251
<key type="filename">x2/light/asset-pack@2x.png</key>
250252
<key type="filename">x2/light/bitmapfont-type@2x.png</key>
251253
<key type="filename">x2/light/blocks@2x.png</key>
1.08 KB
Loading
1.08 KB
Loading
1.62 KB
Loading
1.62 KB
Loading

scripts/make-all-help-files.js

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ utils.makeHelpFile([
88
"Phaser.Loader.LoaderPlugin.atlas(textureURL)",
99
"Phaser.Types.Loader.FileTypes.AtlasJSONFileConfig.normalMap",
1010

11+
"Phaser.Loader.LoaderPlugin.aseprite(atlasURL)",
12+
"Phaser.Loader.LoaderPlugin.aseprite(textureURL)",
13+
1114
"Phaser.Loader.LoaderPlugin.atlasXML(atlasURL)",
1215
"Phaser.Loader.LoaderPlugin.atlasXML(textureURL)",
1316
"Phaser.Types.Loader.FileTypes.AtlasXMLFileConfig.normalMap",
@@ -285,7 +288,18 @@ utils.makeHelpFile([
285288
"spine.SkinsAndAnimationBoundsProvider(timeStep)",
286289
"spine.AnimationState.timeScale",
287290
"spine.AnimationStateData.defaultMix",
288-
"spine.AnimationStateData.setMixWith"
291+
"spine.AnimationStateData.setMixWith",
292+
293+
"Phaser.Types.Animations.PlayAnimationConfig.frameRate",
294+
"Phaser.Types.Animations.PlayAnimationConfig.delay",
295+
"Phaser.Types.Animations.PlayAnimationConfig.repeat",
296+
"Phaser.Types.Animations.PlayAnimationConfig.repeatDelay",
297+
"Phaser.Types.Animations.PlayAnimationConfig.yoyo",
298+
"Phaser.Types.Animations.PlayAnimationConfig.showOnStart",
299+
"Phaser.Types.Animations.PlayAnimationConfig.hideOnComplete",
300+
"Phaser.Types.Animations.PlayAnimationConfig.showBeforeDelay",
301+
"Phaser.Types.Animations.PlayAnimationConfig.startFrame",
302+
"Phaser.Types.Animations.PlayAnimationConfig.timeScale",
289303

290304

291305
], "../source/editor/plugins/phasereditor2d.resources/_res/phasereditor2d.scene/docs/phaser.json");
@@ -300,7 +314,9 @@ utils.makeHelpFile([
300314
"Phaser.Types.Animations.Animation.yoyo",
301315
"Phaser.Types.Animations.Animation.showOnStart",
302316
"Phaser.Types.Animations.Animation.hideOnComplete",
317+
"Phaser.Types.Animations.Animation.showBeforeDelay",
303318
"Phaser.Types.Animations.Animation.skipMissedFrames",
319+
"Phaser.Types.Animations.PlayAnimationConfig.startFrame",
304320

305321
], "../source/editor/plugins/phasereditor2d.resources/_res/phasereditor2d.animations/docs/phaser-docs.json");
306322

source/editor/plugins/colibri/src/ui/controls/properties/FormBuilder.ts

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,20 @@ namespace colibri.ui.controls.properties {
4444
return label;
4545
}
4646

47-
createButton(parent: HTMLElement, text: string, callback: (e?: MouseEvent) => void) {
47+
createButton(parent: HTMLElement, textOrIcon: string | IImage, callback: (e?: MouseEvent) => void) {
4848

4949
const btn = document.createElement("button");
5050

51-
btn.innerText = text;
51+
if (typeof textOrIcon === "string") {
52+
53+
btn.innerText = textOrIcon;
54+
55+
} else {
56+
57+
const iconControl = new controls.IconControl(textOrIcon);
58+
59+
btn.appendChild(iconControl.getCanvas());
60+
}
5261

5362
btn.addEventListener("click", e => callback(e));
5463

0 commit comments

Comments
 (0)