Merge commit '76425b4cd35bd2b5329f49730e0de8226ffc76eb'

deepnight · Jan 11, 2024 · 897e313 · 897e313
2 parents ec977c6 + 76425b4
commit 897e313
Show file tree

Hide file tree

Showing 51 changed files with 4,092 additions and 2,544 deletions.
diff --git a/.github/workflows/package-macos.yml b/.github/workflows/package-macos.yml
@@ -14,7 +14,7 @@ jobs:
     strategy:
       matrix:
         os: [macos-latest]
-        haxe: [4.2.4]
+        haxe: [4.3.3]
       fail-fast: true
     runs-on: macos-latest
 

diff --git a/.github/workflows/package-raspberry.yml b/.github/workflows/package-raspberry.yml
@@ -14,7 +14,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        haxe: [4.2.4]
+        haxe: [4.3.3]
       fail-fast: true
     runs-on: ubuntu-latest
 

diff --git a/.github/workflows/package-ubuntu-dev.yml b/.github/workflows/package-ubuntu-dev.yml
@@ -15,7 +15,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        haxe: [4.2.4]
+        haxe: [4.3.3]
       fail-fast: true
     runs-on: ubuntu-latest
 

diff --git a/.github/workflows/package-ubuntu.yml b/.github/workflows/package-ubuntu.yml
@@ -14,7 +14,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        haxe: [4.2.4]
+        haxe: [4.3.3]
       fail-fast: true
     runs-on: ubuntu-latest
 

diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml
@@ -16,7 +16,7 @@ jobs:
     strategy:
       matrix:
         os: [windows-latest]
-        haxe: [4.2.4]
+        haxe: [4.3.3]
       fail-fast: true
     runs-on: windows-latest
 

diff --git a/app/assets/css/app.min.css b/app/assets/css/app.min.css
diff --git a/app/assets/css/app.scss b/app/assets/css/app.scss
@@ -4605,6 +4605,7 @@ ul.sortable:not(.customHandle) {
 body.panning {
 	#worldDepths,
 	#editingOptions,
+	#pendingActions,
 	#mainPanel,
 	#permanentNotifications,
 	.entityInstanceEditor {
@@ -5227,6 +5228,62 @@ canvas#webgl {
 	}
 
 
+	#pendingActions {
+		position: absolute;
+		z-index: 90;
+		top: 0;
+		left: 40vw;
+
+		display: grid;
+		grid-auto-flow: column;
+		grid-auto-columns: min-content;
+		padding: 2px;
+		padding-top: 4px;
+
+		border-bottom-left-radius: 3px;
+		border-bottom-right-radius: 3px;
+		background-color: $bgDark;
+
+
+		&:empty {
+			display: none;
+		}
+
+		&:hover {
+			padding-top: 5px;
+		}
+
+		button {
+			margin: 0;
+			padding: 4px 8px;
+			font-size: 9pt;
+			white-space: nowrap;
+			box-shadow: 0px 0px 8px $red, 0px 4px 64px $red;
+
+			.icon {
+				margin-right: 4px;
+			}
+
+			animation: blink-animation 0.5s infinite;
+
+			@at-root #page.hasModal #pendingActions button {
+				animation: none;
+			}
+
+			@keyframes blink-animation {
+				from {
+					filter: brightness(1);
+				}
+				30% {
+					filter: brightness(2);
+				}
+				to {
+					filter: brightness(1);
+				}
+			}
+		}
+	}
+
 
 	#editingOptions {
 		position: absolute;

diff --git a/app/assets/tpl/editAllAutoLayerRules.html b/app/assets/tpl/editAllAutoLayerRules.html
@@ -2,7 +2,7 @@ <h2><span class="icon rule"></span>  Rules: ::layer::</h2>
 
 <header>
 	<button class="createGroup"><span class="icon add"></span> group</button>
-	<button class="seed small" title="Change the random seed of the current layer. This will only affect rules that have random variations.">Randomize</button>
+	<button class="small seed" title="Change the random seed of the current layer. This will only affect rules that have random variations.">Randomize</button>
 	<label keys="R" title="Show/hide the render of all auto-layers. You can also press SHIFT-R at any time to toggle this option.">
 		<input type="checkbox" name="renderRules"/>
 		Render

diff --git a/app/assets/tpl/pages/editor.html b/app/assets/tpl/pages/editor.html
@@ -80,9 +80,10 @@
 			<div class="icon tile"></div>
 		</li>
 	</ul>
-
 </div>
 
+<div id="pendingActions"></div>
+
 
 <div id="worldList">
 	<ul></ul>

diff --git a/app/extraFiles/samples/AutoLayers_1_basic.ldtk b/app/extraFiles/samples/AutoLayers_1_basic.ldtk
@@ -5,12 +5,12 @@
 		"doc": "https://ldtk.io/json",
 		"schema": "https://ldtk.io/files/JSON_SCHEMA.json",
 		"appAuthor": "Sebastien 'deepnight' Benard",
-		"appVersion": "1.5.1",
+		"appVersion": "1.5.2",
 		"url": "https://ldtk.io"
 	},
 	"iid": "a22d35f0-7820-11ed-b6fd-213e885f30da",
-	"jsonVersion": "1.5.1",
-	"appBuildId": 473601,
+	"jsonVersion": "1.5.2",
+	"appBuildId": 473607,
 	"nextUid": 112,
 	"identifierStyle": "Capitalize",
 	"toc": [],
@@ -104,6 +104,7 @@
 							"pivotX": 0,
 							"pivotY": 0,
 							"outOfBoundsValue": null,
+							"invalidated": false,
 							"perlinActive": false,
 							"perlinSeed": 336628,
 							"perlinScale": 0.28,
@@ -148,6 +149,7 @@
 							"pivotX": 0,
 							"pivotY": 0,
 							"outOfBoundsValue": null,
+							"invalidated": false,
 							"perlinActive": false,
 							"perlinSeed": 159722,
 							"perlinScale": 0.2,
@@ -179,6 +181,7 @@
 							"pivotX": 0,
 							"pivotY": 0,
 							"outOfBoundsValue": null,
+							"invalidated": false,
 							"perlinActive": false,
 							"perlinSeed": 2671222,
 							"perlinScale": 0.2,
@@ -223,6 +226,7 @@
 							"pivotX": 0,
 							"pivotY": 0,
 							"outOfBoundsValue": null,
+							"invalidated": false,
 							"perlinActive": false,
 							"perlinSeed": 7378060,
 							"perlinScale": 0.2,
@@ -254,6 +258,7 @@
 							"pivotX": 0,
 							"pivotY": 0,
 							"outOfBoundsValue": null,
+							"invalidated": false,
 							"perlinActive": false,
 							"perlinSeed": 8451851,
 							"perlinScale": 0.2,
@@ -285,6 +290,7 @@
 							"pivotX": 0,
 							"pivotY": 0,
 							"outOfBoundsValue": null,
+							"invalidated": false,
 							"perlinActive": false,
 							"perlinSeed": 182798,
 							"perlinScale": 0.2,
@@ -316,6 +322,7 @@
 							"pivotX": 0,
 							"pivotY": 0,
 							"outOfBoundsValue": null,
+							"invalidated": false,
 							"perlinActive": false,
 							"perlinSeed": 5373312,
 							"perlinScale": 0.2,
@@ -347,6 +354,7 @@
 							"pivotX": 0,
 							"pivotY": 0,
 							"outOfBoundsValue": null,
+							"invalidated": false,
 							"perlinActive": false,
 							"perlinSeed": 9668495,
 							"perlinScale": 0.2,
@@ -378,6 +386,7 @@
 							"pivotX": 0,
 							"pivotY": 0,
 							"outOfBoundsValue": null,
+							"invalidated": false,
 							"perlinActive": false,
 							"perlinSeed": 4414423,
 							"perlinScale": 0.2,
@@ -416,6 +425,7 @@
 							"pivotX": 0,
 							"pivotY": 0,
 							"outOfBoundsValue": null,
+							"invalidated": false,
 							"perlinActive": false,
 							"perlinSeed": 3417420,
 							"perlinScale": 0.2,
@@ -460,6 +470,7 @@
 							"pivotX": 0,
 							"pivotY": 0,
 							"outOfBoundsValue": null,
+							"invalidated": false,
 							"perlinActive": false,
 							"perlinSeed": 8013764,
 							"perlinScale": 0.2,

diff --git a/app/extraFiles/samples/AutoLayers_2_stamps.ldtk b/app/extraFiles/samples/AutoLayers_2_stamps.ldtk
@@ -5,12 +5,12 @@
 		"doc": "https://ldtk.io/json",
 		"schema": "https://ldtk.io/files/JSON_SCHEMA.json",
 		"appAuthor": "Sebastien 'deepnight' Benard",
-		"appVersion": "1.5.1",
+		"appVersion": "1.5.2",
 		"url": "https://ldtk.io"
 	},
 	"iid": "a243f240-7820-11ed-b6fd-f550906acdc3",
-	"jsonVersion": "1.5.1",
-	"appBuildId": 473601,
+	"jsonVersion": "1.5.2",
+	"appBuildId": 473607,
 	"nextUid": 40,
 	"identifierStyle": "Capitalize",
 	"toc": [],
@@ -104,6 +104,7 @@
 							"pivotX": 0,
 							"pivotY": 0,
 							"outOfBoundsValue": 1,
+							"invalidated": false,
 							"perlinActive": false,
 							"perlinSeed": 3897482,
 							"perlinScale": 0.2,
@@ -148,6 +149,7 @@
 							"pivotX": 0,
 							"pivotY": 0,
 							"outOfBoundsValue": null,
+							"invalidated": false,
 							"perlinActive": false,
 							"perlinSeed": 7959157,
 							"perlinScale": 0.2,