Merge branch 'develop'

PhaserEditor2D · May 20, 2023 · cc776f1 · cc776f1
2 parents fb18df4 + 7dcf870
commit cc776f1
Show file tree

Hide file tree

Showing 84 changed files with 3,600 additions and 303 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,3 +1,3 @@
 {
-    "workbench.colorTheme": "Solarized Light"
+    "workbench.colorTheme": "Solarized Dark"
 }
diff --git a/CHANGELOG.MD b/CHANGELOG.MD
@@ -1,5 +1,17 @@
 # Change Log
 
+## v3.61.0 - May 18, 2023
+
+* Checks if a scene file was generated by a newer and incompatible version of the editor.
+* Shows Object List items in the Outline view. Allows ordering the items with the Up, Down, Top, Down, commands.
+* A new game object scope: LOCAL. The LOCAL scope is now the default scope for objects and has the same meaning of METHOD scope before. Now the METHOD scope forces the creation of a variable for the object.
+* Auto computes the middle-private nested prefabs. It doesn't require to declare a parent of a nested prefab as nested prefab. 
+* Improves Outline elements tagging. It uses tahs like `#prefab_inst` `#nested_prefab_inst` `#scope_local` `#scope_nested_prefab`... So you can search for it in the Outline filter box.
+* Allows enabling input in objects.
+* Adds the Name parameter to the Variable section of a nested prefab instance.
+* [#282](https://github.com/PhaserEditor2D/PhaserEditor2D-v3/issues/282) Use full nested prefab path in user object variable properties.
+* Excludes script node prefabs from the Blocks view when editing a non-script node scene.
+
 ## v3.60.3 - Apr 27, 2023
 
 * Fixes regression bug with the Play command.

diff --git a/scripts/make-all-help-files.js b/scripts/make-all-help-files.js
@@ -209,6 +209,8 @@ utils.makeHelpFile([
     "Phaser.GameObjects.Ellipse",
     "Phaser.GameObjects.Ellipse.smoothness",
 
+    "Phaser.GameObjects.Polygon",
+
     "Phaser.GameObjects.Triangle",
     "Phaser.Geom.Triangle.x1",
     "Phaser.Geom.Triangle.y1",
@@ -217,7 +219,21 @@ utils.makeHelpFile([
     "Phaser.Geom.Triangle.x3",
     "Phaser.Geom.Triangle.y3",
 
-    "Phaser.GameObjects.Polygon",
+    "Phaser.Geom.Rectangle.x",
+    "Phaser.Geom.Rectangle.y",
+    "Phaser.Geom.Rectangle.width",
+    "Phaser.Geom.Rectangle.height",
+
+    "Phaser.Geom.Ellipse.x",
+    "Phaser.Geom.Ellipse.y",
+    "Phaser.Geom.Ellipse.width",
+    "Phaser.Geom.Ellipse.height",
+
+    "Phaser.Geom.Circle.x",
+    "Phaser.Geom.Circle.y",
+    "Phaser.Geom.Circle.radius",
+
+    "Phaser.Input.InputPlugin.makePixelPerfect(alphaTolerance)",
 
     "Phaser.GameObjects.Layer",
 

diff --git a/source/editor/plugins/colibri/src/ui/controls/Menu.ts b/source/editor/plugins/colibri/src/ui/controls/Menu.ts
@@ -345,7 +345,7 @@ namespace colibri.ui.controls {
 
                 if (menuRect.width > window.innerWidth - x || openLeft) {
 
-                    this._element.style.left = targetRect.right - menuRect.width + "px";
+                    this._element.style.left = Math.max(0, targetRect.right - menuRect.width) + "px";
                 }
 
                 if (menuRect.height > window.innerHeight - y) {

diff --git a/source/editor/plugins/colibri/src/ui/controls/viewers/RenderCellArgs.ts b/source/editor/plugins/colibri/src/ui/controls/viewers/RenderCellArgs.ts
@@ -1,20 +1,20 @@
 namespace colibri.ui.controls.viewers {
 
-  export class RenderCellArgs {
+	export class RenderCellArgs {
 
-    constructor(
-      public canvasContext: CanvasRenderingContext2D,
-      public x: number,
-      public y: number,
-      public w: number,
-      public h: number,
-      public obj: any,
-      public viewer: Viewer,
-      public center = false) {
-    }
+		constructor(
+			public canvasContext: CanvasRenderingContext2D,
+			public x: number,
+			public y: number,
+			public w: number,
+			public h: number,
+			public obj: any,
+			public viewer: Viewer,
+			public center = false) {
+		}
 
-    clone() {
-      return new RenderCellArgs(this.canvasContext, this.x, this.y, this.w, this.h, this.obj, this.viewer, this.center);
-    }
-  }
+		clone() {
+			return new RenderCellArgs(this.canvasContext, this.x, this.y, this.w, this.h, this.obj, this.viewer, this.center);
+		}
+	}
 }
diff --git a/source/editor/plugins/phasereditor2d.ide/src/IDEPlugin.ts b/source/editor/plugins/phasereditor2d.ide/src/IDEPlugin.ts
@@ -133,6 +133,8 @@ namespace phasereditor2d.ide {
 
         openBrowser(url: string) {
 
+            console.log("Opening browser for: " + url);
+
             colibri.Platform.onElectron(electron => {
 
                 colibri.core.io.apiRequest("OpenBrowser", { url });
@@ -149,17 +151,20 @@ namespace phasereditor2d.ide {
 
             const search = startScene ? `?start=${startScene}` : "";
 
-            const url = (config.playUrl || colibri.ui.ide.FileUtils.getRoot().getExternalUrl())
-                    + search;
+            let url: string;
 
-            colibri.Platform.onElectron(electron => {
+            if (config.playUrl) {
 
-                colibri.core.io.apiRequest("OpenBrowser", { url: config.playUrl });
+                url = config.playUrl + search;
 
-            }, () => {
+            } else {
 
-                controls.Controls.openUrlInNewPage(url);
-            });
+                const {protocol, host} = window.location;
+
+                url = `${protocol}//${host}/editor/external/${search}`;
+            }
+
+            this.openBrowser(url);
         }
 
         async requestUpdateAvailable() {
@@ -317,7 +322,7 @@ namespace phasereditor2d.ide {
 
     /* program entry point */
 
-    export const VER = "3.60.3";
+    export const VER = "3.61.0";
 
     async function main() {