Skip to content

Commit 2b09307

Browse files
Merge branch 'develop'
2 parents 955176e + e674ad9 commit 2b09307

File tree

56 files changed

+676
-141
lines changed

Some content is hidden

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

56 files changed

+676
-141
lines changed

CHANGELOG.MD

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

3+
## v3.65.0 - Dec 13, 2024
4+
5+
* Allows using prefabs and user components from node modules.
6+
* Allows tagging folders as "copied" libraries, with the `library.txt` file.
7+
* Adds onWorldBounds property to the Arcade Physics Body.
8+
* The Add Script Node dialog groups scripts by folder and node modules.
9+
* The Blocks view groups the scripts by folder and node modules.
10+
* Allows custom display format of prefab instances, using ${} and #{} expressions.
11+
* Shows tooltip with prefab property info.
12+
* Allows setting a Scene Display Name for scenes.
13+
* Allows setting the Display Name of user components.
14+
* Migrates all project templates to the new script libraries.
15+
316
## v3.64.0 - Nov 10, 2023
417

518
* Fixes making thumbnails of single-layer prefabs.

package-lock.json

Lines changed: 2 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

scripts/make-all-help-files.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -266,6 +266,7 @@ utils.makeHelpFile([
266266
"Phaser.Physics.Arcade.Body.pushable",
267267
"Phaser.Physics.Arcade.Body.immovable",
268268
"Phaser.Physics.Arcade.Body.collideWorldBounds",
269+
"Phaser.Physics.Arcade.Body.onWorldBounds",
269270
"Phaser.Physics.Arcade.Body.mass",
270271
"Phaser.Physics.Arcade.Body.bounce",
271272
"Phaser.Physics.Arcade.Body.friction",

source/editor/plugins/colibri/src/ui/controls/ToolbarManager.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ namespace colibri.ui.controls {
8686
const keyString = action.getCommandKeyString();
8787

8888
if (tooltip) {
89+
8990
controls.Tooltip.tooltipWithKey(btnElement, keyString, tooltip);
9091
}
9192

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ namespace colibri.ui.controls.properties {
3636
label.innerText = text;
3737

3838
if (tooltip) {
39+
3940
Tooltip.tooltip(label, tooltip);
4041
}
4142

source/editor/plugins/phasereditor2d.files/src/FilesPlugin.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,12 @@ namespace phasereditor2d.files {
2626
return this._openFileAction;
2727
}
2828

29+
getFileStyledLabelExtensions(): ui.viewers.StyledFileLabelProviderExtension[] {
30+
31+
return colibri.Platform.getExtensions(
32+
ui.viewers.StyledFileLabelProviderExtension.POINT_ID);
33+
}
34+
2935
public registerExtensions(reg: colibri.ExtensionRegistry) {
3036

3137
// new files

source/editor/plugins/phasereditor2d.files/src/ui/actions/FilesViewCommands.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ namespace phasereditor2d.files.ui.actions {
7979

8080
const viewer = new controls.viewers.TreeViewer("phasereditor2d.files.ui.actions.GoToFile");
8181
viewer.setContentProvider(new controls.viewers.ArrayTreeContentProvider());
82-
viewer.setStyledLabelProvider(new viewers.FileStyledLabelProvider());
82+
viewer.setStyledLabelProvider(new viewers.OpenFileLabelProvider());
8383
viewer.setCellRendererProvider(new viewers.FileCellRendererProvider());
8484

8585
viewer.setInput(colibri.ui.ide.FileUtils.getAllFiles()

source/editor/plugins/phasereditor2d.files/src/ui/viewers/FileStyledLabelProvider.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,22 @@ namespace phasereditor2d.files.ui.viewers {
33
import controls = colibri.ui.controls;
44
import io = colibri.core.io;
55

6-
export class FileStyledLabelProvider implements controls.viewers.IStyledLabelProvider {
6+
export class OpenFileLabelProvider implements controls.viewers.IStyledLabelProvider {
77

8-
getStyledTexts(obj: io.FilePath, dark: boolean): controls.viewers.IStyledText[] {
8+
getStyledTexts(file: io.FilePath, dark: boolean): controls.viewers.IStyledText[] {
99

1010
const theme = controls.Controls.getTheme();
1111

1212
const result = [
1313
{
14-
text: obj.getName(),
14+
text: file.getName(),
1515
color: theme.viewerForeground
1616
}
1717
];
1818

19-
if (obj.getParent()) {
19+
if (file.getParent()) {
2020

21-
let path = obj.getParent().getProjectRelativeName();
21+
let path = file.getParent().getProjectRelativeName();
2222

2323
if (path.startsWith("/")) {
2424

source/editor/plugins/phasereditor2d.files/src/ui/viewers/StyledFileLabelProvider.ts

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,20 @@ namespace phasereditor2d.files.ui.viewers {
88

99
const theme = controls.Controls.getTheme();
1010

11+
const extensions = FilesPlugin.getInstance().getFileStyledLabelExtensions();
12+
13+
for(const ext of extensions) {
14+
15+
const styles = ext.getStyledText(file);
16+
17+
if (styles) {
18+
19+
return styles;
20+
}
21+
}
22+
1123
if (file.getName() === "publicroot") {
24+
1225
return [{
1326
text: file.getName(),
1427
color: dark ? "red" : "brown"
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
namespace phasereditor2d.files.ui.viewers {
2+
3+
import io = colibri.core.io;
4+
import controls = colibri.ui.controls;
5+
6+
export abstract class StyledFileLabelProviderExtension extends colibri.Extension {
7+
8+
static POINT_ID = "phasereditor2d.files.ui.views.FileStyledLabelProviderExtension";
9+
10+
constructor() {
11+
super(StyledFileLabelProviderExtension.POINT_ID);
12+
}
13+
14+
abstract getStyledText(file: io.FilePath): controls.viewers.IStyledText[] | null;
15+
}
16+
}

0 commit comments

Comments
 (0)