Merge pull request #415 from brandmooffin/release/2.4.8.1

Release/2.4.8.1
brandmooffin · Oct 23, 2024 · d6b173f · d6b173f
2 parents 781ca91 + b0ceb97
commit d6b173f
Show file tree

Hide file tree

Showing 29 changed files with 67 additions and 258 deletions.
diff --git a/Nuget Packages/Cocos2D.Android.nuspec b/Nuget Packages/Cocos2D.Android.nuspec
@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>Cocos2D-Mono.Android</id>
-    <version>2.4.8</version>
+    <version>2.4.8.1</version>
     <title>Cocos2D-Mono for Android</title>
     <authors>Cocos2D-Mono Team, Broken Walls Studios</authors>
     <owners>Cocos2D-Mono Team, Broken Walls Studios</owners>
@@ -13,14 +13,7 @@
     <description>Cocos2D-Mono for Android</description>
     <repository url="https://github.com/brandmooffin/cocos2d-mono" />
     <releaseNotes>
-- Support for CCVector2
-- Replace GetActionByTag with GetAction
-- Replace StopActionByTag with StopAction
-- AlignItemsVerticallyWithPadding with AlignItemsVertically
-- AlignItemsHorizontallyWithPadding with AlignItemsHorizontally
-- Add support for pause all sound effects
-- Add support for resume all sound effects
-- Fix out of index error for CCSpriteBatchNode
+- Add method to set atlas texture size for CCLabel
     </releaseNotes>
     <copyright>Copyright © 2024 Cocos2D-Mono Team; Broken Walls Studios, LLC.</copyright>
     <tags>mono monogame cocos2d game</tags>

diff --git a/Nuget Packages/Cocos2D.Core.Android.nuspec b/Nuget Packages/Cocos2D.Core.Android.nuspec
@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>Cocos2D-Mono.Core.Android</id>
-    <version>2.4.8</version>
+    <version>2.4.8.1</version>
     <title>Cocos2D-Mono for Core Android</title>
     <authors>Cocos2D-Mono Team, Broken Walls Studios</authors>
     <owners>Cocos2D-Mono Team, Broken Walls Studios</owners>
@@ -13,14 +13,7 @@
     <description>Cocos2D-Mono for Core Android</description>
     <repository url="https://github.com/brandmooffin/cocos2d-mono" />
     <releaseNotes>
-- Support for CCVector2
-- Replace GetActionByTag with GetAction
-- Replace StopActionByTag with StopAction
-- AlignItemsVerticallyWithPadding with AlignItemsVertically
-- AlignItemsHorizontallyWithPadding with AlignItemsHorizontally
-- Add support for pause all sound effects
-- Add support for resume all sound effects
-- Fix out of index error for CCSpriteBatchNode
+- Add method to set atlas texture size for CCLabel
     </releaseNotes>
     <copyright>Copyright © 2024 Cocos2D-Mono Team; Broken Walls Studios, LLC.</copyright>
     <tags>mono monogame cocos2d game</tags>

diff --git a/Nuget Packages/Cocos2D.Core.DesktopGL.nuspec b/Nuget Packages/Cocos2D.Core.DesktopGL.nuspec
@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>Cocos2D-Mono.Core.DesktopGL</id>
-    <version>2.4.8</version>
+    <version>2.4.8.1</version>
     <title>Cocos2D-Mono for Core DesktopGL</title>
     <authors>Cocos2D-Mono Team, Broken Walls Studios</authors>
     <owners>Cocos2D-Mono Team, Broken Walls Studios</owners>
@@ -13,14 +13,7 @@
     <description>Cocos2D-Mono for Core DesktopGL (OpenGL Desktop Platforms)</description>
     <repository url="https://github.com/brandmooffin/cocos2d-mono" />
     <releaseNotes>
-- Support for CCVector2
-- Replace GetActionByTag with GetAction
-- Replace StopActionByTag with StopAction
-- AlignItemsVerticallyWithPadding with AlignItemsVertically
-- AlignItemsHorizontallyWithPadding with AlignItemsHorizontally
-- Add support for pause all sound effects
-- Add support for resume all sound effects
-- Fix out of index error for CCSpriteBatchNode
+- Add method to set atlas texture size for CCLabel
     </releaseNotes>
     <copyright>Copyright © 2024 Cocos2D-Mono Team; Broken Walls Studios, LLC.</copyright>
     <tags>mono monogame cocos2d game</tags>

diff --git a/Nuget Packages/Cocos2D.Core.Uwp.nuspec b/Nuget Packages/Cocos2D.Core.Uwp.nuspec
@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>Cocos2D-Mono.Core.Uwp</id>
-    <version>2.4.8</version>
+    <version>2.4.8.1</version>
     <title>cocos2d-mono for Core UWP</title>
     <authors>Cocos2D-Mono Team, Broken Walls Studios</authors>
     <owners>Cocos2D-Mono Team, Broken Walls Studios</owners>
@@ -13,14 +13,7 @@
     <description>Cocos2D-Mono for Core UWP (Windows Universal)</description>
     <repository url="https://github.com/brandmooffin/cocos2d-mono" />
     <releaseNotes>
-- Support for CCVector2
-- Replace GetActionByTag with GetAction
-- Replace StopActionByTag with StopAction
-- AlignItemsVerticallyWithPadding with AlignItemsVertically
-- AlignItemsHorizontallyWithPadding with AlignItemsHorizontally
-- Add support for pause all sound effects
-- Add support for resume all sound effects
-- Fix out of index error for CCSpriteBatchNode
+- Add method to set atlas texture size for CCLabel
     </releaseNotes>
     <copyright>Copyright © 2024 Cocos2D-Mono Team; Broken Walls Studios, LLC.</copyright>
     <tags>mono monogame cocos2d game</tags>

diff --git a/Nuget Packages/Cocos2D.Core.Windows.nuspec b/Nuget Packages/Cocos2D.Core.Windows.nuspec
@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>Cocos2D-Mono.Core.Windows</id>
-    <version>2.4.8</version>
+    <version>2.4.8.1</version>
     <title>Cocos2D-Mono for Core Windows</title>
     <authors>Cocos2D-Mono Team, Broken Walls Studios</authors>
     <owners>Cocos2D-Mono Team, Broken Walls Studios</owners>
@@ -13,14 +13,7 @@
     <description>Cocos2D-Mono for Core Windows (DX)</description>
     <repository url="https://github.com/brandmooffin/cocos2d-mono" />
     <releaseNotes>
-- Support for CCVector2
-- Replace GetActionByTag with GetAction
-- Replace StopActionByTag with StopAction
-- AlignItemsVerticallyWithPadding with AlignItemsVertically
-- AlignItemsHorizontallyWithPadding with AlignItemsHorizontally
-- Add support for pause all sound effects
-- Add support for resume all sound effects
-- Fix out of index error for CCSpriteBatchNode
+- Add method to set atlas texture size for CCLabel
     </releaseNotes>
     <copyright>Copyright © 2024 Cocos2D-Mono Team; Broken Walls Studios, LLC.</copyright>
     <tags>mono monogame cocos2d game</tags>

diff --git a/Nuget Packages/Cocos2D.Core.iOS.nuspec b/Nuget Packages/Cocos2D.Core.iOS.nuspec
@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>Cocos2D-Mono.Core.iOS</id>
-    <version>2.4.8</version>
+    <version>2.4.8.1</version>
     <title>Cocos2d-Mono for Core iOS</title>
     <authors>Cocos2D-Mono Team, Broken Walls Studios</authors>
     <owners>Cocos2D-Mono Team, Broken Walls Studios</owners>
@@ -13,14 +13,7 @@
     <description>Cocos2D-Mono for Core iOS</description>
     <repository url="https://github.com/brandmooffin/cocos2d-mono" />
     <releaseNotes>
-- Support for CCVector2
-- Replace GetActionByTag with GetAction
-- Replace StopActionByTag with StopAction
-- AlignItemsVerticallyWithPadding with AlignItemsVertically
-- AlignItemsHorizontallyWithPadding with AlignItemsHorizontally
-- Add support for pause all sound effects
-- Add support for resume all sound effects
-- Fix out of index error for CCSpriteBatchNode
+- Add method to set atlas texture size for CCLabel
     </releaseNotes>
     <copyright>Copyright © 2024 Cocos2D-Mono Team; Broken Walls Studios, LLC.</copyright>
     <tags>mono monogame cocos2d game</tags>

diff --git a/Nuget Packages/Cocos2D.DesktopGL.nuspec b/Nuget Packages/Cocos2D.DesktopGL.nuspec
@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>Cocos2D-Mono.DesktopGL</id>
-    <version>2.4.8</version>
+    <version>2.4.8.1</version>
     <title>Cocos2D-Mono for DesktopGL</title>
     <authors>Cocos2D-Mono Team, Broken Walls Studios</authors>
     <owners>Cocos2D-Mono Team, Broken Walls Studios</owners>
@@ -13,14 +13,7 @@
     <description>Cocos2D-Mono for DesktopGL (OpenGL Desktop Platforms)</description>
     <repository url="https://github.com/brandmooffin/cocos2d-mono" />
     <releaseNotes>
-- Support for CCVector2
-- Replace GetActionByTag with GetAction
-- Replace StopActionByTag with StopAction
-- AlignItemsVerticallyWithPadding with AlignItemsVertically
-- AlignItemsHorizontallyWithPadding with AlignItemsHorizontally
-- Add support for pause all sound effects
-- Add support for resume all sound effects
-- Fix out of index error for CCSpriteBatchNode
+- Add method to set atlas texture size for CCLabel
     </releaseNotes>
     <copyright>Copyright © 2024 Cocos2D-Mono Team; Broken Walls Studios, LLC.</copyright>
     <tags>mono monogame cocos2d game</tags>

diff --git a/Nuget Packages/Cocos2D.Uwp.nuspec b/Nuget Packages/Cocos2D.Uwp.nuspec
@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>Cocos2D-Mono.Uwp</id>
-    <version>2.4.8</version>
+    <version>2.4.8.1</version>
     <title>cocos2d-mono for UWP</title>
     <authors>Cocos2D-Mono Team, Broken Walls Studios</authors>
     <owners>Cocos2D-Mono Team, Broken Walls Studios</owners>
@@ -13,14 +13,7 @@
     <description>Cocos2D-Mono for UWP (Windows Universal)</description>
     <repository url="https://github.com/brandmooffin/cocos2d-mono" />
     <releaseNotes>
-- Support for CCVector2
-- Replace GetActionByTag with GetAction
-- Replace StopActionByTag with StopAction
-- AlignItemsVerticallyWithPadding with AlignItemsVertically
-- AlignItemsHorizontallyWithPadding with AlignItemsHorizontally
-- Add support for pause all sound effects
-- Add support for resume all sound effects
-- Fix out of index error for CCSpriteBatchNode
+- Add method to set atlas texture size for CCLabel
     </releaseNotes>
     <copyright>Copyright © 2024 Cocos2D-Mono Team; Broken Walls Studios, LLC.</copyright>
     <tags>mono monogame cocos2d game</tags>

diff --git a/Nuget Packages/Cocos2D.Windows.nuspec b/Nuget Packages/Cocos2D.Windows.nuspec
@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>Cocos2D-Mono.Windows</id>
-    <version>2.4.8</version>
+    <version>2.4.8.1</version>
     <title>Cocos2D-Mono for Windows</title>
     <authors>Cocos2D-Mono Team, Broken Walls Studios</authors>
     <owners>Cocos2D-Mono Team, Broken Walls Studios</owners>
@@ -13,14 +13,7 @@
     <description>Cocos2D-Mono for Windows (DX)</description>
     <repository url="https://github.com/brandmooffin/cocos2d-mono" />
     <releaseNotes>
-- Support for CCVector2
-- Replace GetActionByTag with GetAction
-- Replace StopActionByTag with StopAction
-- AlignItemsVerticallyWithPadding with AlignItemsVertically
-- AlignItemsHorizontallyWithPadding with AlignItemsHorizontally
-- Add support for pause all sound effects
-- Add support for resume all sound effects
-- Fix out of index error for CCSpriteBatchNode
+- Add method to set atlas texture size for CCLabel
     </releaseNotes>
     <copyright>Copyright © 2024 Cocos2D-Mono Team; Broken Walls Studios, LLC.</copyright>
     <tags>mono monogame cocos2d game</tags>

diff --git a/Nuget Packages/Cocos2D.iOS.nuspec b/Nuget Packages/Cocos2D.iOS.nuspec
@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>Cocos2D-Mono.iOS</id>
-    <version>2.4.8</version>
+    <version>2.4.8.1</version>
     <title>Cocos2d-Mono for iOS</title>
     <authors>Cocos2D-Mono Team, Broken Walls Studios</authors>
     <owners>Cocos2D-Mono Team, Broken Walls Studios</owners>
@@ -13,14 +13,7 @@
     <description>Cocos2D-Mono for iOS</description>
     <repository url="https://github.com/brandmooffin/cocos2d-mono" />
     <releaseNotes>
-- Support for CCVector2
-- Replace GetActionByTag with GetAction
-- Replace StopActionByTag with StopAction
-- AlignItemsVerticallyWithPadding with AlignItemsVertically
-- AlignItemsHorizontallyWithPadding with AlignItemsHorizontally
-- Add support for pause all sound effects
-- Add support for resume all sound effects
-- Fix out of index error for CCSpriteBatchNode
+- Add method to set atlas texture size for CCLabel
     </releaseNotes>
     <copyright>Copyright © 2024 Cocos2D-Mono Team; Broken Walls Studios, LLC.</copyright>
     <tags>mono monogame cocos2d game</tags>

diff --git a/box2d/box2d.Android/box2d.Android.csproj b/box2d/box2d.Android/box2d.Android.csproj
@@ -10,7 +10,7 @@
     <BaseIntermediateOutputPath>obj\Android\Debug</BaseIntermediateOutputPath>
 	<GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
 	<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    <Version>2.4.8</Version>
+    <Version>2.4.8.1</Version>
     <Title>box2d for Android</Title>
     <Authors>Cocos2D-Mono Team, Broken Walls Studios</Authors>
     <Description>box2d for Android</Description>

diff --git a/box2d/box2d.DesktopGL/box2d.DesktopGL.csproj b/box2d/box2d.DesktopGL/box2d.DesktopGL.csproj
@@ -12,7 +12,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <ApplicationManifest>app.manifest</ApplicationManifest>
-    <Version>2.4.8</Version>
+    <Version>2.4.8.1</Version>
     <PackageId>box2d.DesktopGL</PackageId>
     <Company>Broken Walls Studios</Company>
     <Copyright>Copyright © 2024 Cocos2D-Mono Team; Broken Walls Studios, LLC.</Copyright>
@@ -25,14 +25,7 @@
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageReleaseNotes>
-- Support for CCVector2
-- Replace GetActionByTag with GetAction
-- Replace StopActionByTag with StopAction
-- AlignItemsVerticallyWithPadding with AlignItemsVertically
-- AlignItemsHorizontallyWithPadding with AlignItemsHorizontally
-- Add support for pause all sound effects
-- Add support for resume all sound effects
-- Fix out of index error for CCSpriteBatchNode
+- Add method to set atlas texture size for CCLabel
 	</PackageReleaseNotes>
     <PackageProjectUrl>https://github.com/brandmooffin/cocos2d-mono</PackageProjectUrl>
     <RepositoryUrl>https://github.com/brandmooffin/cocos2d-mono</RepositoryUrl>

diff --git a/box2d/box2d.Uwp/Properties/AssemblyInfo.cs b/box2d/box2d.Uwp/Properties/AssemblyInfo.cs
@@ -35,5 +35,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.4.8")]
-[assembly: AssemblyFileVersion("2.4.8")]
+[assembly: AssemblyVersion("2.4.8.1")]
+[assembly: AssemblyFileVersion("2.4.8.1")]
diff --git a/box2d/box2d.Windows/box2d.Windows.csproj b/box2d/box2d.Windows/box2d.Windows.csproj
@@ -13,7 +13,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <ApplicationManifest>app.manifest</ApplicationManifest>
-    <Version>2.4.8</Version>
+    <Version>2.4.8.1</Version>
     <PackageId>box2d.Windows</PackageId>
     <Company>Broken Walls Studios</Company>
     <Copyright>Copyright ©  2024 Cocos2D-Mono Team; Broken Walls Studios, LLC.</Copyright>
@@ -26,14 +26,7 @@
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageReleaseNotes>
-- Support for CCVector2
-- Replace GetActionByTag with GetAction
-- Replace StopActionByTag with StopAction
-- AlignItemsVerticallyWithPadding with AlignItemsVertically
-- AlignItemsHorizontallyWithPadding with AlignItemsHorizontally
-- Add support for pause all sound effects
-- Add support for resume all sound effects
-- Fix out of index error for CCSpriteBatchNode
+- Add method to set atlas texture size for CCLabel
 	</PackageReleaseNotes>
     <PackageProjectUrl>https://github.com/brandmooffin/cocos2d-mono</PackageProjectUrl>
     <RepositoryUrl>https://github.com/brandmooffin/cocos2d-mono</RepositoryUrl>

diff --git a/box2d/box2d.iOS/box2d.iOS.csproj b/box2d/box2d.iOS/box2d.iOS.csproj
@@ -9,20 +9,13 @@
     <AssemblyName>box2d.iOS</AssemblyName>
     <Title>box2d for iOS</Title>
     <Authors>Cocos2D-Mono Team, Broken Walls Studios</Authors>
-    <Version>2.4.8</Version>
+    <Version>2.4.8.1</Version>
     <Description>box2d for iOS</Description>
     <Copyright>Copyright © 2024 Cocos2D-Mono Team; Broken Walls Studios, LLC.</Copyright>
     <PackageProjectUrl>https://github.com/brandmooffin/cocos2d-mono</PackageProjectUrl>
     <RepositoryUrl>https://github.com/brandmooffin/cocos2d-mono</RepositoryUrl>
     <PackageReleaseNotes>
-- Support for CCVector2
-- Replace GetActionByTag with GetAction
-- Replace StopActionByTag with StopAction
-- AlignItemsVerticallyWithPadding with AlignItemsVertically
-- AlignItemsHorizontallyWithPadding with AlignItemsHorizontally
-- Add support for pause all sound effects
-- Add support for resume all sound effects
-- Fix out of index error for CCSpriteBatchNode
+- Add method to set atlas texture size for CCLabel
 	</PackageReleaseNotes>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

diff --git a/cocos2d/base_nodes/CCNode.cs b/cocos2d/base_nodes/CCNode.cs
@@ -2317,8 +2317,9 @@ protected virtual void Dispose(bool disposing)
             if (Children != null && Children.Count > 0)
             {
                 CCNode[] elements = Children.Elements;
-                foreach (CCNode child in Children.Elements)
+                for (var index = 0; index < Children.Elements.Length; index++)
                 {
+                    var child = Children.Elements[index];
                     if (child != null)
                     {
                         if (!child.m_bCleaned)
@@ -2337,10 +2338,12 @@ public void CleanUpParentsProperly()
             if (Children != null && Children.Count > 0)
             {
                 CCNode[] elements = Children.Elements;
-                foreach (CCNode child in Children.Elements)
+                for (var index = 0; index < Children.Elements.Length; index++)
                 {
+                    var child = Children.Elements[index];
                     child?.CleanUpParentsProperly();
                 }
+
                 Children.Clear(true);
             }
             Parent = null;

diff --git a/cocos2d/cocos2d.Android/cocos2d.Android.csproj b/cocos2d/cocos2d.Android/cocos2d.Android.csproj
@@ -15,7 +15,7 @@
 	    - iOS improvements
 	</PackageReleaseNotes>
     <Authors>Cocos2D-Mono Team, Broken Walls Studios</Authors>
-    <Version>2.4.8</Version>
+    <Version>2.4.8.1</Version>
     <Title>Cocos2D-Mono for Android</Title>
     <Description>Cocos2D-Mono for Android</Description>
     <Copyright>Copyright © 2024 Cocos2D-Mono Team; Broken Walls Studios, LLC.</Copyright>

diff --git a/cocos2d/cocos2d.Core.Android/cocos2d.Core.Android.csproj b/cocos2d/cocos2d.Core.Android/cocos2d.Core.Android.csproj
@@ -15,7 +15,7 @@
 	    - iOS improvements
 	</PackageReleaseNotes>
     <Authors>Cocos2D-Mono Team, Broken Walls Studios</Authors>
-    <Version>2.4.8</Version>
+    <Version>2.4.8.1</Version>
     <Title>Cocos2D-Mono for Core Android</Title>
     <Description>Cocos2D-Mono for Core Android</Description>
     <Copyright>Copyright © 2024 Cocos2D-Mono Team; Broken Walls Studios, LLC.</Copyright>