06d51ac961
Merge: d3f55e0472 8e723b0cc9
...
Merge branch '1.x' into dev
2023-08-31 18:09:23 +08:00
4a52c781a2
Fix ci
2023-08-31 18:07:23 +08:00
09db3594f2
Merge: 3d97d1bcc1 0a63a8e364
...
Merge branch '1.x' into dev
2023-08-31 17:57:36 +08:00
a3a117ad2d
Update script permision
2023-08-31 17:57:19 +08:00
449a596f3e
Merge: fd2cbdc331 a816a8ac64
...
Merge branch '1.x' into dev
# Conflicts:
# README.md
# README_CN.md
# install-pwsh.sh
# tools/console/axmol
2023-08-31 17:56:09 +08:00
c2e55c4cdc
Merge console-next from dev into 1.x
2023-08-31 17:48:39 +08:00
cce6c2f8e1
Improve code style
2023-08-30 19:35:38 +08:00
0ab5023997
Update UIVideoPlayerTest.cpp
...
Use mp4 url because Apple only support video container format .mp4, not support .mkv
2023-06-19 20:20:03 +08:00
bc82034ffd
Improve media-engine for android, linux ( #1228 )
...
* Improve media-engine
- Implement andorid,linux
- Improve local file uri scheme
* Fix ci
* Improve code style
* Improve
* Update VlcMediaEngine.cpp
* Update AvfMediaEngine.h
* Fix ci
* Improve code style
* Enable androidx gradle.properties [skip ci]
* Improve code style
* Remove unnecessary callbacks
* Rename VideoPlayer to MediaPlayer
2023-06-10 22:05:49 +08:00
5d79202f49
Update VideoPlayerTest url [skip ci]
2023-06-05 21:49:33 +08:00
621c94c9e7
Enable video player(VideoTexture) based on new MediaEngine for macOS and tvos ( #1154 )
...
* Ready for PR macOS
* Update videoTexture.frag
* Fix compile
* Fix h265 for mac [skip ci]
* Fix compile error
* Update readme [skip ci]
2023-04-02 01:51:36 +08:00
1e6e9d4a8d
Media engine video texture ( #1133 )
...
* VideoPlayer based on new MediaEngine[Win32/UWP]
* Improve MediaEngine interface
* Update readme
* Improve pixel format
* Improve MediaEngine interface
* Ready for PR UWP/Win32
* Ready for PR UWP,Win32
* Update reademe files
* Update readme files
* Update UIVideoPlayer-android.cpp [skip ci]
* Update UIVideoPlayer-ios.mm
* Update MFUtils.cpp
* Fix ci
2023-03-25 08:37:51 +08:00
912bf32d13
Remove UWP from PC family
2023-03-14 12:08:31 +08:00
277bcd44ce
Windows Store UWP apps support ( #1108 )
...
* [BIG FEATURE] Windows Store UWP apps support
* Fix ci, add uwp for pr-ci
* Fix ci
* Improve ci script
* Fix ci
* Fix ci
* Fix ci
* Fix ci
* Upload uwp appx package artifacts [skip ci]
* Use d2d draw system font text
* Fix ci
* Improve code style
2023-03-11 22:10:18 +08:00
83d53ba46b
Tidy project tree and full symlink support ( #1072 )
...
* Tidy project file tree and all symlink support
2023-02-23 21:57:30 +08:00
halx99