Merge branch 'release/2.x' into dev

Author: halx99

1k/1kiss.ps1

@@ -1875,6 +1875,15 @@ if (!$setupOnly) {
     $SOURCE_DIR = $null
 
     function resolve_out_dir($prefix) {
+        if ($prefix.EndsWith('/') -or $prefix.EndsWith('\')) {
+          if ($is_host_target) {
+            return $1k.realpath("$prefix$TARGET_CPU/")
+          }
+          else {
+              return $1k.realpath("$prefix${TARGET_OS}_$TARGET_CPU/")
+          }
+        }
+        
         if ($is_host_target) {
             if (!$is_host_cpu) {
                 $out_dir = "${prefix}${TARGET_CPU}"
@@ -2246,7 +2255,6 @@ if (!$setupOnly) {
         Write-Output ("gn_buildargs_overrides=$gn_buildargs_overrides, Count={0}" -f $gn_buildargs_overrides.Count)
 
         $BUILD_DIR = resolve_out_dir 'out/'
-
         if ($rebuild) {
             $1k.rmdirs($BUILD_DIR)
         }

1k/build.profiles

@@ -58,7 +58,7 @@ min_sdk=21
 
 # The gradle version, @setup.ps1
 # as latest as possible
-gradle=9.0.0
+gradle=9.1.0
 
 # The android gradle plugin, @setup.ps1
 # as stable as possible, match with build-tools,android-studio

1k/fetch.ps1

@@ -212,10 +212,14 @@ if ($is_git_repo) {
     }
 
     if ($old_rev_hash -ne $new_rev_hash) {
-        git -C $lib_src checkout $revision 1>$null 2>$null
+        git -C $lib_src checkout -- .
+        git -C $lib_src checkout $revision 1>$null
+        if ($LASTEXITCODE -ne 0) {
+            throw "fetch.ps1: checkout $lib_src to version: $revision fail"
+        }
         $cur_rev_hash = $(git -C $lib_src rev-parse HEAD)
         if ($cur_rev_hash -ne $new_rev_hash) {
-            println "fetch.ps1: warning: cur_rev_hash($cur_rev_hash) != new_rev_hash($new_rev_hash)"
+            throw "fetch.ps1: cur_rev_hash($cur_rev_hash) != new_rev_hash($new_rev_hash)"
         }
 
         $is_rev_mod = $true
@@ -232,11 +236,16 @@ if ($is_git_repo) {
     }
 }
 
+# whether the repo use gn build system?
+$is_gn = Test-Path (Join-Path $lib_src '.gn') -PathType Leaf
+
 if ($is_rev_mod) {
     $sentry_content = "ver: $version"
     if ($is_git_repo) {
         if ((Test-Path (Join-Path $lib_src '.gitmodules') -PathType Leaf)) {
-            git -C $lib_src submodule update --recursive --init
+            if (!$is_gn) {
+                git -C $lib_src submodule update --recursive --init
+            }
         }
         if ($branch_name) {
             # tracking branch
@@ -258,11 +267,17 @@ if ($is_rev_mod) {
 }
 
 # google gclient spec
-if (Test-Path (Join-Path $lib_src '.gn') -PathType Leaf) {
+if ($is_gn) {
     # the repo use google gn build system manage deps and build
     Push-Location $lib_src
     # angle (A GLES native implementation by google)
     if (Test-Path 'scripts/bootstrap.py' -PathType Leaf) {
+        # need reset local modifications before execute gclient sync -D
+        git -C $lib_src checkout -- .
+        $build_tool_dir = Join-Path $lib_src 'build'
+        if (Test-Path $build_tool_dir -PathType Container) {
+          git -C $build_tool_dir checkout -- .
+        }
         python scripts/bootstrap.py
     }
     # darwin (A WebGPU native implementation by google)

CHANGELOG.md

@@ -22,6 +22,7 @@
 - Fix `ui::MediaPlayer` may crash on Apple platforms by @halx99 in [#2704](https://github.com/axmolengine/axmol/pull/2704)
 - Fix occasional missing Android assets in AAB build by @paulocoutinhox in [#2713](https://github.com/axmolengine/axmol/pull/2713)
 - Fix format specifiers in logging calls by @rh101 in [#2749](https://github.com/axmolengine/axmol/pull/2749)
+- Fix for crash when director is reset during scene transition by @halx99 [#2802](https://github.com/axmolengine/axmol/pull/2802)
 
 
 ## Improvements
@@ -37,6 +38,8 @@
 - Remove CI pull-request trigger event: `ready_for_review` by @halx99
 - Update kcp to resolve cmake error by @halx99
 - Dispatch applicationScreenSizeChanged when layoutSubviews on ios by @halx99
+- Rename internal ios class: EARenderView => RenderHostView by @halx99
+- Make Director::getRunningScene() return the expected result for any type of scene switch when called from Node::onEnter() by @rh101 in [#2799](https://github.com/axmolengine/axmol/pull/2799)
 
 ## SDK & Tools updates
 

INFRA.md

@@ -19,7 +19,7 @@
 ## gradle
 
 - [![github](https://img.shields.io/github/v/release/gradle/gradle?label=Upstream)](https://github.com/gradle/gradle)
-- Version: 9.0.0
+- Version: 9.1.0
 - License: Apache-2.0
 - Platform: Android
 - Manged by: `1k/build.profiles`

axmol/base/Director.cpp

@@ -1021,6 +1021,13 @@ void Director::reset()
         }
 #endif  // AX_ENABLE_GC_FOR_NATIVE_OBJECTS
         _runningScene->onExit();
+
+        // Ensure incoming scene is correctly deactivated if the
+        // director is reset during a scene transition
+        auto transition = dynamic_cast<TransitionScene*>(_runningScene);
+        if (transition)
+            transition->getInScene()->onExit();
+
         _runningScene->cleanup();
         _runningScene->release();
     }
@@ -1168,41 +1175,42 @@ void Director::setNextScene()
 {
     _eventDispatcher->dispatchEvent(_beforeSetNextScene);
 
-    bool runningIsTransition = dynamic_cast<TransitionScene*>(_runningScene) != nullptr;
-    bool newIsTransition     = dynamic_cast<TransitionScene*>(_nextScene) != nullptr;
+    auto outgoingScene = _runningScene;
+    _runningScene      = _nextScene;
+    _nextScene         = nullptr;
 
-    // If it is not a transition, call onExit/cleanup
-    if (!newIsTransition)
+    bool outgoingSceneIsTransition = dynamic_cast<TransitionScene*>(outgoingScene) != nullptr;
+
+    if (outgoingScene)
     {
-        if (_runningScene)
-        {
-            _runningScene->onExitTransitionDidStart();
-            _runningScene->onExit();
-        }
+        bool incomingSceneIsTransition = dynamic_cast<TransitionScene*>(_runningScene) != nullptr;
 
-        // issue #709. the root node (scene) should receive the cleanup message too
-        // otherwise it might be leaked.
-        if (_sendCleanupToScene && _runningScene)
+        // If it is not a transition, call onExit/cleanup
+        if (!incomingSceneIsTransition)
         {
-            _runningScene->cleanup();
+            outgoingScene->onExitTransitionDidStart();
+            outgoingScene->onExit();
+
+            // issue #709. the root node (scene) should receive the cleanup message too
+            // otherwise it might be leaked.
+            if (_sendCleanupToScene)
+            {
+                outgoingScene->cleanup();
+            }
         }
+
+        outgoingScene->release();
     }
 
     if (_runningScene)
     {
-        _runningScene->release();
-    }
-    _runningScene = _nextScene;
-    if (_nextScene)
-    {
-        _nextScene->retain();
-    }
-    _nextScene = nullptr;
+        _runningScene->retain();
 
-    if ((!runningIsTransition) && _runningScene)
-    {
-        _runningScene->onEnter();
-        _runningScene->onEnterTransitionDidFinish();
+        if (!outgoingSceneIsTransition)
+        {
+            _runningScene->onEnter();
+            _runningScene->onEnterTransitionDidFinish();
+        }
     }
 
     _eventDispatcher->dispatchEvent(_afterSetNextScene);

templates/common/proj.android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Fri Aug  8 15:49:42 UTC+08 2025
+#Wed Sep 24 23:21:50 UTC+08 2025
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

templates/common/proj.android/gradlew

@@ -1,6 +1,6 @@
-#Fri Aug  8 15:49:42 UTC+08 2025
+#Wed Sep 24 23:21:50 UTC+08 2025
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists