Skip to content

Commit 6ee3fd1

Browse files
committed
Version 2.6.0
1 parent b3874e5 commit 6ee3fd1

File tree

4 files changed

+17
-7
lines changed

4 files changed

+17
-7
lines changed

1k/build.profiles

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ axslcc=1.9.6+
1010

1111
# The cmake, @gradle @axmol-cmdline
1212
# as latest as possible
13-
cmake=3.30.0~4.0.0+
13+
cmake=3.30.0~4.0.2+
1414

1515
# The ninja
1616
ninja=1.10.0~1.12.1+
@@ -34,7 +34,7 @@ llvm=17.0.6~19.1.7+
3434
# region platform:android
3535

3636
# The microsoft openjdk, @axmol-cmdline
37-
jdk=17.0.10~17.0.13+
37+
jdk=17.0.10~17.0.15+
3838

3939
# The android cmdline-tools aka sdkmanager, as stable as possible
4040
cmdlinetools=12.0
@@ -70,7 +70,7 @@ buildtools=35.0.0
7070

7171
# The android studio, @hint
7272
# as latest as possible, but match with agp, build-tools
73-
androidstudio=2024.2.1+
73+
androidstudio=2024.3.2+
7474

7575
# The android dependencies managed by @gradle
7676
appcompat=1.7.0

AUTHORS.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,14 @@ Due to Axmol Engine is a fork of Cocos2d-x-4.0, so the [Cocos2d-x AUTHORS](https
2929
(in alphabetical order)
3030

3131
aismann
32-
AsakuraMizu (Asakura Mizu)
3332
armanhossiny
33+
AsakuraMizu (Asakura Mizu)
34+
AlexandreK38
3435
Arvant
3536
bwaiox
3637
binxiaojiao
38+
blairwang
39+
caryyu
3740
crazyhappygame
3841
CodeAndWeb
3942
clawfinger (Dmitry Vassiliev)
@@ -44,11 +47,15 @@ Due to Axmol Engine is a fork of Cocos2d-x-4.0, so the [Cocos2d-x AUTHORS](https
4447
huizhen
4548
4649
iAndyHD3
50+
IamSanjid
4751
j-jorge
4852
Joilnen
53+
Janglee123
4954
5055
maksg (Maksymilian Galas)
5156
nowasm
57+
MartinLutherSu
58+
NgVThangBz
5259
Niborski (Pink)
5360
Obg1 (Oren Bengigi)
5461
paulocoutinhox (Paulo Coutinho)
@@ -58,5 +65,6 @@ Due to Axmol Engine is a fork of Cocos2d-x-4.0, so the [Cocos2d-x AUTHORS](https
5865
Tas-I-te (Tan Shjie)
5966
tkzcfc
6067
theunwisewolf (TheUnwiseWolf)
68+
Tosik86
6169
weiwest
6270
Yehsam23

CHANGELOG.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## axmol-2.6.0 ?? 2025
1+
## axmol-2.6.0 May.23 2025
22

33
### Significant changes relative to 2.5.0:
44

@@ -7,7 +7,8 @@
77

88
### Bug fixes
99

10-
- Fix https://github.com/axmolengine/axmol/issues/2545 install pwsh fail on ubuntu-25.04 by @halx99
10+
- Fix #2548 Downloader-curl may crash or hang in download thread in https://github.com/axmolengine/axmol/pull/2549 by @halx99
11+
- Fix #2545 install pwsh fail on ubuntu-25.04 by @halx99
1112
- Fix wasm build fail on windows by @halx99 in https://github.com/axmolengine/axmol/pull/2511
1213
- Fix PNG_ARM_NEON_OPT flag by @halx99 in https://github.com/axmolengine/axmol/pull/2512
1314
- Fix #2504 play opus audio fail when build with Apple OpenAL.framework by @halx99 in https://github.com/axmolengine/axmol/pull/2506
@@ -44,6 +45,7 @@
4445
- Move simd intrinsics detection from 3rd into core by @halx99
4546
- Add minimum version to build docs support by @halx99, now the ci will only build & deploy axmol-2.3+ docs
4647
- Remove deprecated DSL config: renderscriptDebuggable by @halx99 in https://github.com/axmolengine/axmol/pull/2546
48+
- Implement ui::MediaPlayer::getVirtualRenderer by @halx99
4749

4850
### SDKs & Tools updates
4951

core/ui/UIMediaPlayer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1137,7 +1137,7 @@ void MediaPlayer::draw(Renderer* renderer, const Mat4& transform, uint32_t flags
11371137
if (!vrender || !engine)
11381138
return;
11391139

1140-
if (vrender->isVisible() && isPlaying())
1140+
if (isPlaying())
11411141
{ // render 1 video sample if avaiable
11421142
engine->transferVideoFrame();
11431143
}

0 commit comments

Comments
 (0)