Merge pull request #47 from TorqueGameEngines/development

Merge of Torque2D 4.0 EA2
TorqueGameEngines · Jun 27, 2022 · 15ad3e1 · 15ad3e1
2 parents be8ca31 + 828f65a
commit 15ad3e1
Show file tree

Hide file tree

Showing 532 changed files with 14,196 additions and 76,396 deletions.
diff --git a/.github/workflows/PR-builds.yml b/.github/workflows/PR-builds.yml
@@ -0,0 +1,115 @@
+name: Build Packages
+on: [push, pull_request, workflow_dispatch]
+jobs:
+  Build-Windows-32bit-VS2019:
+    name: 32-bit Windows On VS2019
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: microsoft/[email protected]
+      - run: msbuild -m "engine/compilers/VisualStudio 2019/Torque 2D.sln" /p:Configuration=Debug /p:Platform=win32
+      - run: msbuild -m "engine/compilers/VisualStudio 2019/Torque 2D.sln" /p:Configuration=Release /p:Platform=win32
+      - uses: actions/upload-artifact@v2
+        with:
+          name: Torque2D_Windows_x86_32bit_VS2019
+          path: |
+            .
+            ! .git/
+            ! engine/
+  Build-Windows-64bit-VS2019:
+    name: 64-bit Windows On VS2019
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: microsoft/[email protected]
+      - run: msbuild -m "engine/compilers/VisualStudio 2019/Torque 2D.sln" /p:Configuration=Debug /p:Platform=x64
+      - run: msbuild -m "engine/compilers/VisualStudio 2019/Torque 2D.sln" /p:Configuration=Release /p:Platform=x64
+      - uses: actions/upload-artifact@v2
+        with:
+          name: Torque2D_Windows_x86_64bit_VS2019
+          path: |
+            .
+            ! .git/
+            ! engine/
+  Build-Windows-32bit-VS2017:
+    name: 32-bit Windows On VS2017
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: microsoft/[email protected]
+      - run: msbuild -m "engine/compilers/VisualStudio 2017/Torque 2D.sln" /p:Configuration=Debug /p:Platform=win32
+      - run: msbuild -m "engine/compilers/VisualStudio 2017/Torque 2D.sln" /p:Configuration=Release /p:Platform=win32
+      - uses: actions/upload-artifact@v2
+        with:
+          name: Torque2D_Windows_x86_32bit_VS2017
+          path: |
+            .
+            ! .git/
+            ! engine/
+  Build-Windows-64bit-VS2017:
+    name: 64-bit Windows On VS2017
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: microsoft/[email protected]
+      - run: msbuild -m "engine/compilers/VisualStudio 2017/Torque 2D.sln" /p:Configuration=Debug /p:Platform=x64
+      - run: msbuild -m "engine/compilers/VisualStudio 2017/Torque 2D.sln" /p:Configuration=Release /p:Platform=x64
+      - uses: actions/upload-artifact@v2
+        with:
+          name: Torque2D_Windows_x86_64bit_VS2017
+          path: |
+            .
+            ! .git/
+            ! engine/
+  Build-Linux-32Bit:
+    name: Build package for 32-bit x86 Linux
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - run: cd engine/compilers/Make-32bit/ && make
+      - uses: actions/upload-artifact@v2
+        with:
+          name: Torque2D_Linux_x86_32bit
+          path: |
+            .
+            ! .git/
+            ! engine/
+  Build-Linux-64bit:
+    name: Build package for 64-bit x86 Linux
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - run: cd engine/compilers/Make-64bit/ && make
+      - uses: actions/upload-artifact@v2
+        with:
+          name: Torque2D_Linux_x86_64bit
+          path: |
+            .
+            ! .git/
+            ! engine/
+  Build-MacOS:
+    name: Build package for MacOS
+    runs-on: macOS-latest
+    steps:
+      - uses: actions/checkout@v2
+      - run: cd engine/compilers/Xcode && xcodebuild -project Torque2D.xcodeproj
+      - uses: actions/upload-artifact@v2
+        with:
+          name: Torque2D_MacOS
+          path: |
+            .
+            ! .git/
+            ! engine/
+  Build-iOS:
+    name: Build package for iOS
+    runs-on: macOS-latest
+    steps:
+      - uses: actions/checkout@v2
+      - run: cd engine/compilers/Xcode_iOS && xcodebuild CODE_SIGNING_ALLOWED=no -project Torque2D.xcodeproj
+      - uses: actions/upload-artifact@v2
+        with:
+          name: Torque2D_iOS
+          path: |
+            .
+            ! .git/
+            ! engine/
diff --git a/.gitignore b/.gitignore
@@ -26,8 +26,12 @@ Torque2D.exe
 Torque2D_DEBUG.exe
 Torque2DGame.app
 Torque2DGame_Debug.app
+Torque2D
+Torque2D_DEBUG
 linkmap.txt
 **/.vs/**
+.vscode/
+*.vcxproj.FileListAbsolute.txt
 
 # Compiled source #
 ###################
@@ -38,6 +42,8 @@ linkmap.txt
 *.so
 *.obj
 *.lib
+*.lib.recipe
+*.exe.recipe
 *.idb
 *.pdb
 *.ilk
@@ -77,3 +83,10 @@ engine/compilers/android-studio/app/src/main/obj/
 engine/compilers/android-studio/app/src/main/libs/
 engine/compilers/android-studio/app/src/main/game/
 engine/compilers/android-studio/app/.externalNativeBuild/
+
+# Linux build files #
+#####################
+engine/compilers/Make-32bit/Debug/
+engine/compilers/Make-32bit/Release/
+engine/compilers/Make-64bit/Debug/
+engine/compilers/Make-64bit/Release/
diff --git a/editor/AssetAdmin/AssetAdmin.cs b/editor/AssetAdmin/AssetAdmin.cs
@@ -35,6 +35,7 @@
 	exec("./NewAudioAssetDialog.cs");
 	exec("./DeleteAssetDialog.cs");
 	exec("./ParticleEditor/exec.cs");
+	exec("./ImageEditor/exec.cs");
 
 	%this.guiPage = EditorCore.RegisterEditor("Asset Manager", %this);
 	%this.guiPage.add(%this.buildAssetWindow());

diff --git a/editor/AssetAdmin/AssetDictionaryButton.cs b/editor/AssetAdmin/AssetDictionaryButton.cs
@@ -123,6 +123,7 @@ class = "AssetDictionarySprite";
 		Position = "0 0";
 		constrainProportions = "1";
 		fullSize = "1";
+		UseInput = false;
 	};
 	ThemeManager.setProfile(%texture, "spriteProfile");
 	return %texture;

diff --git a/editor/AssetAdmin/AssetInspector.cs b/editor/AssetAdmin/AssetInspector.cs
@@ -99,10 +99,9 @@
 
 	//Inspector Tab
 	%this.insPage = %this.createTabPage("Inspector", "");
-	%this.tabBook.add(%this.insPage);
-
 	%this.insScroller = %this.createScroller();
 	%this.insPage.add(%this.insScroller);
+	%this.tabBook.add(%this.insPage);
 
 	%this.inspector = %this.createInspector();
 	%this.insScroller.add(%this.inspector);
@@ -112,6 +111,9 @@
 
 	//Emitter Graph Tool
 	%this.emitterGraphPage = %this.createTabPage("Emitter Graph", "AssetParticleGraphEmitterTool", "AssetParticleGraphTool");
+
+	//Image Frame Edit Tool
+	%this.imageFrameEditPage = %this.createTabPage("Frame Edit", "AssetImageFrameEditTool", "");
 }
 
 function AssetInspector::createTabPage(%this, %name, %class, %superClass)
@@ -201,14 +203,8 @@
 	%this.titleDropDown.visible = false;
 	%this.tabBook.Visible = true;
 	%this.tabBook.selectPage(0);
-	if(%this.tabBook.isMember(%this.scaleGraphPage))
-	{
-		%this.tabBook.remove(%this.scaleGraphPage);
-	}
-	if(%this.tabBook.isMember(%this.emitterGraphPage))
-	{
-		%this.tabBook.remove(%this.emitterGraphPage);
-	}
+	%this.tabBook.removeIfMember(%this.scaleGraphPage);
+	%this.tabBook.removeIfMember(%this.emitterGraphPage);
 
 	%this.emitterButtonBar.visible = false;
 	%this.deleteAssetButton.visible = true;
@@ -217,6 +213,8 @@
 function AssetInspector::loadImageAsset(%this, %imageAsset, %assetID)
 {
 	%this.resetInspector();
+	%this.tabBook.add(%this.imageFrameEditPage);
+	%this.tabBook.selectPage(0);
 	%this.titlebar.setText("Image Asset:" SPC %imageAsset.AssetName);
 
 	%this.inspector.clearHiddenFields();
@@ -227,6 +225,8 @@
 	%this.inspector.addHiddenField("ExplicitMode");
 	%this.inspector.inspect(%imageAsset);
 	%this.inspector.openGroupByIndex(0);
+
+	%this.imageFrameEditPage.inspect(%imageAsset);
 }
 
 function AssetInspector::loadAnimationAsset(%this, %animationAsset, %assetID)
@@ -280,10 +280,7 @@
 		%this.inspector.addHiddenField("AssetPrivate");
 		%this.inspector.inspect(%particleAsset);
 
-		if(%this.tabBook.isMember(%this.emitterGraphPage))
-		{
-			%this.tabBook.remove(%this.emitterGraphPage);
-		}
+		%this.tabBook.removeIfMember(%this.emitterGraphPage);
 		%this.tabBook.add(%this.scaleGraphPage);
 		%this.scaleGraphPage.inspect(%particleAsset);
 	}
@@ -293,10 +290,7 @@
 		%this.inspector.addHiddenField("locked");
 		%this.inspector.inspect(%particleAsset.getEmitter(%index - 1));
 
-		if(%this.tabBook.isMember(%this.scaleGraphPage))
-		{
-			%this.tabBook.remove(%this.scaleGraphPage);
-		}
+		%this.tabBook.removeIfMember(%this.scaleGraphPage);
 		%this.tabBook.add(%this.emitterGraphPage);
 		%this.emitterGraphPage.inspect(%particleAsset, %index - 1);
 	}