Merge branch 'axmolengine:dev' into dev

axmolengine · Oct 22, 2024 · a666c2c · a666c2c
2 parents 94efedc + 8a705f1
commit a666c2c
Show file tree

Hide file tree

Showing 16 changed files with 105 additions and 21 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -14,6 +14,10 @@ on:
          default: 'auto'
          # Input has to be provided for the workflow to run
          required: false
+      commitish: 
+        description: 'Please input commitis value that determines where the Git tag is created from. Can be any branch or commit SHA. Defaults to repository default branch.'
+        default: 'dev'
+        required: false
 jobs:
   publish:
     runs-on: windows-latest
@@ -62,7 +66,7 @@ jobs:
         ./setup.ps1
         ./1k/fetch.ps1 -uri 'oboe' -prefix $(Join-Path $AX_ROOT 'cache') -manifest $(Join-Path $AX_ROOT 'manifest.json')
         axmol -xc '-DAX_WITH_LZ4=ON,-DAX_WITH_CARES=ON,-DAX_WITH_YAML_CPP=ON,-DAX_WITH_KCP=ON' -c
-        ./tools/ci/publish.ps1 -version "${{ steps.forward_ver.outputs.release_ver }}"
+        ./tools/ci/publish.ps1 -version "${{ steps.forward_ver.outputs.release_ver }}" -commitish "${{ github.event.inputs.commitish }}"
 
     - name: Publish to github release page
       if: ${{ steps.make_pkg.outputs.release_tag != '' }}
@@ -73,5 +77,6 @@ jobs:
         files: ${{ steps.make_pkg.outputs.release_pkg }}
         body_path: ${{ steps.make_pkg.outputs.release_note }}
         prerelease: ${{ steps.make_pkg.outputs.prerelease }}
+        target_commitish: ${{ github.event.inputs.commitish }}
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/1k/install-pwsh.sh b/1k/install-pwsh.sh
@@ -12,7 +12,7 @@ mkdir -p $cacheDir
 
 pwsh_ver=$1
 if [ "$pwsh_ver" = "" ] ; then
-    pwsh_ver='7.4.4'
+    pwsh_ver='7.4.5'
 fi
 
 pwsh_min_ver=$2
@@ -64,8 +64,8 @@ elif [ $HOST_OS = 'Linux' ] ; then
             curl -L "https://github.com/PowerShell/PowerShell/releases/download/v$pwsh_ver/$pwsh_pkg" -o "$pwsh_pkg_out"
         fi
         sudo_cmd=$(which sudo)
-        $sudo_cmd dpkg -i "$pwsh_pkg_out"
-        $sudo_cmd apt-get install -f
+        $sudo_cmd dpkg -i --ignore-depends=libicu72 "$pwsh_pkg_out"
+        $sudo_cmd apt-get install -f powershell
     elif command -v pacman > /dev/null; then # Linux distro: Arch
         # refer: https://ephos.github.io/posts/2018-9-17-Pwsh-ArchLinux
         # available pwsh version, refer to: https://aur.archlinux.org/packages/powershell-bin

diff --git a/1k/manifest.ps1 b/1k/manifest.ps1
@@ -11,7 +11,7 @@
 if ($Global:is_axmol_app -or $Global:is_axmol_engine) {
     $manifest['nuget'] = '5.5.1' # since 5.6.0, requires .net 4.0
     $manifest['glslcc'] = '1.9.5+'
-    $manifest['cmake'] = '3.29.3~3.30.3+'
+    $manifest['cmake'] = '3.29.3~3.30.5+'
     $manifest['emsdk'] = '3.1.66~3.1.67+'
     $manifest['jdk'] = '17.0.10~17.0.12+'
     $manifest['vs'] = '16.0+'

diff --git a/3rdparty/README.md b/3rdparty/README.md
@@ -22,7 +22,7 @@
 
 ## c-ares
 - [![Upstream](https://img.shields.io/github/v/release/c-ares/c-ares?label=Upstream)](https://github.com/c-ares/c-ares)
-- Version: 1.33.1
+- Version: 1.34.2
 - License: MIT
 
 ## Chipmunk2D
@@ -68,6 +68,7 @@
 ## {fmt}
 - [![Upstream](https://img.shields.io/github/v/release/fmtlib/fmt?label=Upstream)](https://github.com/fmtlib/fmt)
 - Version: 11.0.2
+
 - License: MIT
 
 ## FreeType
@@ -123,7 +124,7 @@
 
 - luajit
   - Upstream: https://github.com/LuaJIT/LuaJIT
-  - Version: 2.1-87ae18a
+  - Version: 2.1-97813fb
   - License: MIT
 
 - tolua

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,22 +1,91 @@
-## axmol-2.2.0 ??
+## axmol-2.2.1 Oct.22 2024
+
+### Bug fixes
+
+- Fix curl link error on macOS
+
+## axmol-2.2.0 Oct.20 2024
+
+### Significant changes relative to 2.1.5:
+
+- Enable vsync by default by @halx99 in https://github.com/axmolengine/axmol/pull/2118
+- Improve android media player, also fix #2101 by @halx99 in https://github.com/axmolengine/axmol/pull/2109
+- Add build on ubuntu 24.04 support by @halx99 in https://github.com/axmolengine/axmol/pull/2152
+- No longer add sprite as child of RenderTexture by @halx99 in https://github.com/axmolengine/axmol/pull/2149
+- API change too: remove all DrawNode setLineWidth() stuff by @aismann in https://github.com/axmolengine/axmol/pull/2172
+
+### Bug fixes
+
+- Fix invalidated iterator access in `Scheduler::unscheduleAllWithMinPriority()` by @smilediver in https://github.com/axmolengine/axmol/pull/2194
+- Fix label in PauseTest. by @Tosik86 in https://github.com/axmolengine/axmol/pull/2157
+- Fix #2147 full screen incorrect on macOS by @halx99 in https://github.com/axmolengine/axmol/pull/2150
+- Fix RenderTargetGL FBO not recreate when recv EVENT_RENDERER_RECREATED by @halx99 in https://github.com/axmolengine/axmol/pull/2148
+- Fix EventMouse coords by @halx99 in https://github.com/axmolengine/axmol/pull/2141
+- Fix for incorrect bits per pixel set on texture reload by @rh101 in https://github.com/axmolengine/axmol/pull/2138
+- Fix move constructor comment in Data class by @Tosik86 in https://github.com/axmolengine/axmol/pull/2132
+- Fix Node `setPosition()` and `setPositionNormalized()` not switching normalized mode if positions match by @smilediver in https://github.com/axmolengine/axmol/pull/2102
+- Fix issue with widget positioning when using normalized coordinates by @rh101 in https://github.com/axmolengine/axmol/pull/2110
+- Fix RenderTexture data needs to be saved to the cache before the GLSurfaceView context is lost by @rh101 in https://github.com/axmolengine/axmol/pull/2146
+- Fix incorrect static value usage in JNI array methods by @rh101 in https://github.com/axmolengine/axmol/pull/2178
+- Fix #2199 by @halx99 in https://github.com/axmolengine/axmol/pull/2200
+- Fix LuaJit Compilations by @IamSanjid in https://github.com/axmolengine/axmol/pull/2159
+- Fix #2163 by @halx99 in https://github.com/axmolengine/axmol/pull/2166
+- Fix #2169 by @halx99 in https://github.com/axmolengine/axmol/pull/2170
+- fix Crash Sprite when _texture null by @NgVThangBz in https://github.com/axmolengine/axmol/pull/2164
+- Fix dangling ref in `SpriteFrameCache::removeSpriteFramesFromTexture()` by @smilediver in https://github.com/axmolengine/axmol/pull/2106
+- Fix android fps issue when certain animation intervals are set by @rh101 in https://github.com/axmolengine/axmol/pull/2162
+- Fix DownloaderCURL too many open files and other fixes by @smilediver in https://github.com/axmolengine/axmol/pull/2182
+
+### Improvements
+
+- [ImGui] Allow setting of custom font config to enable merging of multiple fonts and other features by @rh101 in https://github.com/axmolengine/axmol/pull/2085
+- Update DevSetup.md with iOS simulator build commands by @rh101 in https://github.com/axmolengine/axmol/pull/2087
+- Remove couple bad warnings by @smilediver in https://github.com/axmolengine/axmol/pull/2088
+- Trim trailing whitespace for files in `core` folder by @smilediver in https://github.com/axmolengine/axmol/pull/2089
+- Remove the NS_AX_BEGIN and NS_AX_END macros. by @j-jorge in https://github.com/axmolengine/axmol/pull/2100
+- Remove the USING_NS_AX and NS_AX macros. by @j-jorge in https://github.com/axmolengine/axmol/pull/2103
+- Remove usage of the NS_AX macro. by @j-jorge in https://github.com/axmolengine/axmol/pull/2107
+- Sprite: show stretch warning only if stretching is enabled by @smilediver in https://github.com/axmolengine/axmol/pull/2113
+- Delay load mf.dll, mfplat.dll by @halx99 in https://github.com/axmolengine/axmol/pull/2116
+- Remove unreferenced sprite from test scene by @rh101 in https://github.com/axmolengine/axmol/pull/2119
+- Set RenderTexture content size on creation by @rh101 in https://github.com/axmolengine/axmol/pull/2120
+- Update sweep.h  (fix invalid UTF-8) by @aismann in https://github.com/axmolengine/axmol/pull/2121
+- Math optimizations by @smilediver in https://github.com/axmolengine/axmol/pull/2115
+- DrawNode V2  by @aismann in https://github.com/axmolengine/axmol/pull/2124
+- USe gradle-8.8-bin.zip everywhere by @crazyhappygame in https://github.com/axmolengine/axmol/pull/2134
+- Refine contributing.md guide by @Tosik86 in https://github.com/axmolengine/axmol/pull/2135
+- Allow turn on/off deprecated features by @halx99 in https://github.com/axmolengine/axmol/pull/2136
+- Math: remove and replace GP_ASSERT with AX_ASSERT by @smilediver in https://github.com/axmolengine/axmol/pull/2143
+- Enable cache render data for webgl by default by @halx99 in https://github.com/axmolengine/axmol/pull/2151
+- Fix some compiling deprecated issues by @halx99 in https://github.com/axmolengine/axmol/pull/2154
+- Update DrawNode.cpp (fix #2140) by @aismann in https://github.com/axmolengine/axmol/pull/2158
+- Add (missing) parameter 'drawLineToCenter' to 'drawSolidCircle(...)' by @aismann in https://github.com/axmolengine/axmol/pull/2160
+- Optimize DrawNode by @smilediver in https://github.com/axmolengine/axmol/pull/2165
+- remove DrawPrimitivesTests (Cocos2Dx) (redundant mit DrawNodeTest) by @aismann in https://github.com/axmolengine/axmol/pull/2179
+- move ZwoptexTest to SpriteTest (better add it to the SpriteTest section as removing) by @aismann in https://github.com/axmolengine/axmol/pull/2180
+- Update README.md (thirdparty) by @aismann in https://github.com/axmolengine/axmol/pull/2183
+- `AxmolActivity` refactoring and fixes by @smilediver in https://github.com/axmolengine/axmol/pull/2185
+- Update controller.cpp Add small hint that the DrawNode tests be "not finished": "Node: Draw (WIP)" by @aismann in https://github.com/axmolengine/axmol/pull/2189
+- DrawNode calls: replacing Color4F with Color4B (without the 'test' folder!) by @aismann in https://github.com/axmolengine/axmol/pull/2192
 
 ### sdks updates
 
 - emsdk: 3.1.63 ==> 3.1.67
 
 ### 3rdparty updates
 
-- glad: 2.0.6 ==> 2.0.7
+- glad: 2.0.6 ==> 2.0.8
 - curl: 8.9.1 ==> 8.10.1
 - simdjson: 3.10.0 ==> 3.10.1
 - libpng: 1.6.43 ==> 1.6.44
-- c-ares: 1.33.0 ==> 1.33.1
+- c-ares: 1.33.0 ==> 1.34.1
 - openssl: 3.3.1 ==> 3.0.15
 - yasio: 4.2.4 ==> 4.3.1
 - jpeg-turbo: 3.0.3 ==> 3.0.4
-- luajit: 2.1-04dca79 ==> 2.1-87ae18a
+- luajit: 2.1-04dca79 ==> 2.1-97813fb
 - simdjson: 3.10.0 ==> 3.10.1
 - rapidjson: 1.1.0-b4a6da3 ==> 1.1.0-815e6e7
+- freetype: 2.13.2 ==> 2.13.3
 
 ## axmol-2.1.5 Aug.11 2024
 

diff --git a/core/axmolver.h.in b/core/axmolver.h.in
@@ -5,7 +5,7 @@
 // 00   03 08 00
 #define AX_VERSION_MAJOR 2
 #define AX_VERSION_MINOR 2
-#define AX_VERSION_PATCH 0
+#define AX_VERSION_PATCH 1
 
 /* Define axmol version helper macros */
 #define AX_VERSION_MAKE(a, b, c) ((a << 16) | (b << 8) | (c & 0xff))

diff --git a/core/base/json.h b/core/base/json.h
@@ -0,0 +1,4 @@
+#pragma once
+
+#include "rapidjson/rapidjson.h"
+#include "rapidjson/document.h"
diff --git a/docs/DevSetup.md b/docs/DevSetup.md
@@ -161,7 +161,7 @@ Please see the [Windows workflow guide](https://github.com/axmolengine/axmol/iss
 
 ### Android (Android Studio)
 
-  1. Install [Android Studio 2023.1.1+](https://developer.android.com/studio).
+  1. Install [Android Studio 2024.1.2+](https://developer.android.com/studio).
   2. When starting Android Studio for the first time, it will guide you through the installation of the SDK and other tools. Please make sure that you do install them.
   3. Start Android Studio and choose [Open an existing Android Studio Project] and select your project. For example, the existing `cpp-test` project located in `axmol\tests\cpp-tests\proj.android`.
   4. Start Android Studio and open 'Tools' -> 'SDKManager', then switch to 'SDK Tools', check the 'Show Package Details' field, and choose the following tools clicking the button 'Apply' to install them:  

diff --git a/manifest.json b/manifest.json
@@ -1,6 +1,6 @@
 {
   "versions": {
-    "1kdist": "v92",
+    "1kdist": "v93",
     "oboe": "1.9.0",
     "kcp": "v1.7-f2aa30e",
     "lz4": "v1.10.0",

diff --git a/templates/common/proj.android/build.gradle b/templates/common/proj.android/build.gradle
@@ -7,7 +7,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.4.0'
+        classpath 'com.android.tools.build:gradle:8.6.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/tests/cpp-tests/proj.android/build.gradle b/tests/cpp-tests/proj.android/build.gradle
@@ -7,7 +7,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.4.0'
+        classpath 'com.android.tools.build:gradle:8.6.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/tests/fairygui-tests/proj.android/build.gradle b/tests/fairygui-tests/proj.android/build.gradle
@@ -7,7 +7,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.4.0'
+        classpath 'com.android.tools.build:gradle:8.6.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/tests/live2d-tests/proj.android/build.gradle b/tests/live2d-tests/proj.android/build.gradle
@@ -7,7 +7,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.4.0'
+        classpath 'com.android.tools.build:gradle:8.6.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/tests/lua-tests/proj.android/build.gradle b/tests/lua-tests/proj.android/build.gradle
@@ -7,7 +7,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.4.0'
+        classpath 'com.android.tools.build:gradle:8.6.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/tests/unit-tests/proj.android/build.gradle b/tests/unit-tests/proj.android/build.gradle
@@ -7,7 +7,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.4.0'
+        classpath 'com.android.tools.build:gradle:8.6.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/tools/ci/publish.ps1 b/tools/ci/publish.ps1
@@ -1,8 +1,13 @@
 param(
-    $version = $null
+    $version = $null,
+    $commitish = $null
 )
 
 $AX_ROOT = (Resolve-Path $PSScriptRoot/../..).Path
+if ($commitish) {
+    echo "Creating package from revision: $commitish"
+    git -C $AX_ROOT checkout $commitish
+}
 
 $prerelease = 'false'
 if (!$version -or ($version -eq 'auto')) {