Merge branch 'development' of https://github.com/TorqueGameEngines/To…

…rque2D into development
TorqueGameEngines · Nov 14, 2023 · 418c992 · 418c992
2 parents db1f12f + 3c0b831
commit 418c992
Show file tree

Hide file tree

Showing 8 changed files with 165 additions and 34 deletions.
diff --git a/.github/workflows/PR-builds.yml b/.github/workflows/PR-builds.yml
@@ -62,6 +62,10 @@ jobs:
         with:
           vs-version: '[17.0, 18.0)'
           msbuild-architecture: x64
+      - uses: ChristopheLav/windows-sdk-install@v1
+        with:
+          version-sdk: 22621
+          features: 'OptionId.UWPCPP,OptionId.DesktopCPParm64'
       - run: msbuild -m "engine/compilers/VisualStudio 2022/Torque 2D.sln" /p:Configuration=Debug /p:Platform=x64
       - run: msbuild -m "engine/compilers/VisualStudio 2022/Torque 2D.sln" /p:Configuration=Release /p:Platform=x64
       - uses: actions/upload-artifact@v2

diff --git a/engine/compilers/Xcode/Torque2D.xcodeproj/project.pbxproj b/engine/compilers/Xcode/Torque2D.xcodeproj/project.pbxproj
diff --git a/engine/compilers/Xcode/Torque2D.xcodeproj/xcshareddata/xcschemes/Torque2D.xcscheme b/engine/compilers/Xcode/Torque2D.xcodeproj/xcshareddata/xcschemes/Torque2D.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1320"
+   LastUpgradeVersion = "1500"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/...lers/Xcode/Torque2D/en.lproj/MainMenu.xib → ...rs/Xcode/Torque2D/Base.lproj/MainMenu.xib b/...lers/Xcode/Torque2D/en.lproj/MainMenu.xib → ...rs/Xcode/Torque2D/Base.lproj/MainMenu.xib
diff --git a/engine/compilers/Xcode/Torque2D/Torque2D-Info.plist b/engine/compilers/Xcode/Torque2D/Torque2D-Info.plist
@@ -24,15 +24,15 @@
 	<key>CFBundleIconFile</key>
 	<string>torque2d</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.garagegames.${PRODUCT_NAME:rfc1034identifier}</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
 	<string>${PRODUCT_NAME}</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>4.0.0 ea3</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
@@ -42,7 +42,7 @@
 	<key>NSHighResolutionCapable</key>
 	<false/>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2012 GarageGames, LLC. All rights reserved.</string>
+	<string>Copyright © 2023 Torque Game Engines and Garage Games, LLC. Available to use under the MIT License.</string>
 	<key>NSMainNibFile</key>
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>

diff --git a/engine/compilers/Xcode/Torque2D/en.lproj/InfoPlist.strings b/engine/compilers/Xcode/Torque2D/en.lproj/InfoPlist.strings
diff --git a/engine/compilers/Xcode/torque2d.icns b/engine/compilers/Xcode/torque2d.icns
diff --git a/engine/source/gui/guiTreeViewCtrl.h b/engine/source/gui/guiTreeViewCtrl.h
@@ -32,7 +32,6 @@ class GuiTreeViewCtrl : public GuiListBoxCtrl
 {
 private:
 	typedef GuiListBoxCtrl Parent;
-	class TreeItem;
 
 	enum class ReorderMethod { Above, Below, Insert };
 	S32 mFocusLevel;