Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
3,528 Commits 4 Branches 31 Tags 1.1 GiB
Commit Graph

233 Commits

Author SHA1 Message Date
halx99 bd0e1fef4b Fix compile error 2023-08-13 22:09:02 +08:00
Deal 572bb2f700 Test use glad on android 2023-08-13 00:24:35 +08:00
halx99 b125be598a Update readme files 2023-08-11 15:31:36 +08:00
halx99 cc9cbcbff9 Merge: eba7fc17ba 6bbdc273f8 
Merge branch 'main' into dev
 2023-08-10 18:53:35 +08:00
halx99 46ed10dac3 Update yasio to v4.1.0 2023-08-10 18:36:45 +08:00
halx99 e945a5b3b2 Update readme files 2023-08-09 22:29:40 +08:00
halx99 1ec408812f Fix cmake setup 2023-08-09 14:37:43 +08:00
Deal 969baf94d4 Update CHANGELOG [skip ci] 2023-08-09 13:52:28 +08:00
halx99 842d7c1666 Update readme files [skip ci] 2023-08-01 12:07:19 +08:00
halx99 1c25aea206 Reduce ci checks 2023-07-01 21:54:12 +08:00
halx99 6f672eefa5 Update readme files [skip ci] 2023-06-19 16:06:37 +08:00
halx99 a603350a3a Update readme files 2023-06-12 11:12:39 +08:00
Deal(涓€绾跨伒) 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
halx99 278b1ac184 Update README.md 2023-06-05 21:47:37 +08:00
halx99 e05d0c4905 [Video] Enable VideoTexture streaming for iOS 2023-06-01 12:48:40 +08:00
Deal(涓€绾跨伒) 46a21e729b Building with ninja + official llvm-clang-cl support (#1159) 
* Building with ninja + official llvm-clang-cl support

* Update gh ci for clang

* Fix ci

* Fix ci

* Fix ci

* FIx dll copy [skip ci]

* Fix ci warnings

* Update ci files and readme

* Update badges
 2023-04-02 16:04:19 +08:00
Deal(涓€绾跨伒) 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
halx99 72d1f96b6e Update readme files 2023-04-01 16:14:05 +08:00
halx99 2209df46a1 Update readme 2023-04-01 16:07:55 +08:00
halx99 dc4e141387 Update readme & ci files 2023-03-25 11:18:21 +08:00
Deal(涓€绾跨伒) 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
halx99 2f04914405 [UWP] Add cmake option: AX_VS_DEPLOYMENT_TARGET 
a. It's useful to specify UWP apps deploy target version, vs property is
TargetPlatformMinVersion
b. Use `CMAKE_VS_WINDOWS_TARGET_PLATFORM_MIN_VERSION` possible
supported by cmake-3.27.0 or later
 2023-03-14 08:24:27 +08:00
halx99 53208eedbc Update build status badges 2023-03-11 23:34:10 +08:00
halx99 1c97c31799 Update readme files 2023-03-11 23:08:08 +08:00
halx99 7202e55ba2 Drop python2 support 2023-02-13 17:52:05 +08:00
halx99 50447f3003 Update logo [skip ci] 2022-12-17 16:32:20 +08:00
涓€绾跨伒|Deal a4057d9cec Update README_CN.md 2022-11-09 11:41:17 +08:00
涓€绾跨伒|Deal de3f56d4ff Update README_CN.md 2022-10-13 23:57:50 +08:00
涓€绾跨伒|Deal 48a7da97d6 Final migrate (#876) 2022-10-01 16:24:52 +08:00
Paulo Coutinho f5aeb5a8c2 Add apple tvos support (#846) 
* support tvos

* support tvos and fix run command

* support tvos, fix run script and fix windows files

* support tvos on ci

* support tvos on ci and fix windows zlib

* support tvos on ci

* support tvos

* support tvos and tvos tests
 2022-09-05 14:13:52 +08:00
涓€绾跨伒|Deal e37761260a Migrate, use simple namespace ax (#818) 2022-08-29 20:51:22 +08:00
halx99 2f400931d6 Fix #786 2022-08-09 16:44:52 +08:00
涓€绾跨伒 9892aa3d1c Migrate axys (#782) 2022-08-08 18:02:17 +08:00
halx99 484aa38856 Update android gradle plugin to 7.2.2 2022-08-06 20:05:12 +08:00
halx99 4555804b22 Update readme files 2022-08-06 19:47:45 +08:00
halx99 27232ecafd Update readme files 2022-08-02 17:54:18 +08:00
halx99 8efce27d0c Update readme files 2022-07-21 22:15:13 +08:00
涓€绾跨伒 0b1c5be9c8 Update README_CN.md 2022-07-19 16:25:13 +08:00
halx99 a402a80ad7 Fix ios device build issue 2022-07-14 17:20:18 +08:00
涓€绾跨伒 cb20eb614c Merge: 35a95b0c0f a4d40c0bbe 
Merge pull request #726 from DelinWorks/migrate-engine-name

Improve Readme title.
 2022-07-07 18:27:42 +08:00
halx99 f11930eb08 Auto ignore all *.md files for ci 2022-07-07 17:42:45 +08:00
DelinWorks 9dae9ddaff Improve Readme title. 2022-07-07 12:05:04 +03:00
DelinWorks 5d6def0ed8 Update md files. [skip ci] 2022-07-07 11:26:13 +03:00
涓€绾跨伒 6f1d7221d6 Update readme files (#674) 
* Update README_CN.md

* Update README.md
 2022-06-27 22:21:19 +08:00
Turky Mohammed 5a0f0f9073 Merge: 101f09d912 820ad21a46 
Merge branch 'adxeproject:dev' into camera-2d-zoom-feature
 2022-06-17 17:16:55 +03:00
DelinWorks fed10a0197 Add comment. [skip ci] 2022-06-17 17:16:39 +03:00
Turky Mohammed 7c1c0a0f56 Merge: 610711a164 990531ecdc 
Merge branch 'adxeproject:dev' into partical-system-animation
 2022-06-16 19:41:56 +03:00
DelinWorks fd4bfb0fd5 Apply orthographic zoom values non-destructively. 2022-06-16 16:41:40 +03:00
halx99 4301448ba4 Set default encoding to UTF-8 [skip ci] 2022-06-16 21:18:31 +08:00
Turky Mohammed fc2ff5003f Update CCParticleSystem.h 2022-06-16 14:13:59 +03:00
halx99 51b6e5391f Fix ci, astc only support sse2 for x86 target 2022-06-16 12:22:39 +08:00
DelinWorks 73b29e235e Add cpp_tests and improve system. 2022-06-15 23:04:08 +03:00
halx99 5c9ab14d3e Fix astc cmake simd check for windows x64 2022-06-15 21:16:51 +08:00
DelinWorks 82722eefc2 Fix rotation override and node base class calls. 
Make sure Node class calls it's base functions and NOT the ones overridden when changing position, and make sure the rotation set for the camera isn't altered when calling applyCustomProperties().
 2022-06-15 16:10:47 +03:00
aismann a0dfe6e2ab SimpleSnake small updates 
- CodeCleanup
- MIT License file
- readme update
 2022-06-15 07:02:08 +02:00
DelinWorks 14666d9c1f Add position rotation setters & getters override for custom behaviors. 2022-06-15 03:48:26 +03:00
涓€绾跨伒 b9bc6b7357 cocos2dVersion compatible (#655) 
* cocos2dVersion compatible

* Update [skip ci]
 2022-06-14 13:33:45 +08:00
DelinWorks a9f2e29ebf Add zoom and camera features. 2022-06-13 21:04:24 +03:00
halx99 e3314e1222 Update minimal xcode version requirement 2022-06-13 20:12:14 +08:00
Turky Mohammed 87e4fad96c Merge: a2bea19e1e 3ac444efa6 
Merge branch 'adxeproject:dev' into partical-system-animation
 2022-06-12 17:26:54 +03:00
DelinWorks 237a3ccbad Improve emission shapes workflow. 
`ps->addEmissionShape(ParticleSystem::createConeShape({ -2000, 0 }, 400, 90, 50));` is the new workflow.
 2022-06-11 18:06:43 +03:00
涓€绾跨伒 03c8056078 Merge: 5138d701d6 5c35eda3b9 
Merge pull request #650 from adxeproject/ndk-r23c

Upgrade android toolsets to ndk-r23c LTS
 2022-06-11 16:57:37 +08:00
halx99 89c075f679 Fix ci 2022-06-11 16:21:47 +08:00
halx99 9bf295d8e4 Upgrade android toolsets 
- ndk to r23c
- gradle plugin to 7.2.0
- gradle wrapper to 7.4.2
- config ndk ver at adxetools.gradle
 2022-06-11 16:16:47 +08:00
halx99 a435a3a224 Update readme files and changelog 2022-02-26 15:24:20 +08:00
halx99 9672a50007 Update reference links on README files 2022-02-26 14:33:48 +08:00
deal 6647fa18d5 Update README_CN.md 2022-02-25 11:24:27 +08:00
deal 9afd478ea9 Add windows video play support [render video sample to texture2d] (#577) 
* [Draft] Implement windows video player

Based on microsoft media foundation

* Delete pvd

* Shutdown MF media before release player

* Consider MFMediaPlayer ref leak

* Use Microsoft::WRL::ComPtr

* Simplify code

* Improve code and take care COM object refs

* Update UIVideoPlayer-win.cpp

* Delete unused code

* Add play from url support

* Update logic

* Rename ADXE_ENABLE_MFMEDIA to AX_ENABLE_MFMEDIA

* Rescale video render sprite to view node

* Fix warnings

* Don't shallow copy the video context, it's very dangerous

* Fix compile error CC_VIDEOPLAYER_DEBUG_DRAW=1

* Fixup

* [Window video player] play event dispatch

* support switch video file

* Update UIVideoPlayer-win.cpp

* [windows-video-player] keep aspect ratio and full screen support

* Improve code

* Update changelog [skip ci]

* Update README.md

* Update README.md

* Update README.md

* Update README_CN.md

* Update README_CN.md
 2022-02-24 17:57:08 +08:00
halx99 7ce188ebda Finish #578 2022-02-17 17:11:17 +08:00
deal 8790e0e3df Update version badge 2022-02-16 11:57:42 +08:00
halx99 0f212a69c8 Update recommend android studio and gradle 
- Android Studio 2021.1.1+ (More intelligent)
- Gralde wrapper to 7.2: https://services.gradle.org/distributions/gradle-7.2-bin.zip.zip
- Gradle Plugin to 7.1: com.android.tools.build:gradle:7.1.0

These upgrades will fix the issue: #573
 2022-01-28 12:47:05 +08:00
halx99 d5dd3bc175 Update changelog 2022-01-05 14:50:39 +08:00
deal f32280ff42 Merge: 687d15f16e 369de31853 
Merge pull request #560 from adxeproject/ahead

Merge ahead to dev
 2021-12-31 12:12:40 +08:00
halx99 64d7b55366 Update ci branch name 2021-12-31 11:00:35 +08:00
halx99 688447a524 Update badges 2021-12-28 21:50:41 +08:00
halx99 4be73844b6 Update badges 2021-12-28 21:32:25 +08:00
halx99 cf9f4b342b Update version 2021-12-28 21:28:04 +08:00
halx99 7e2672d308 Update README_CN.md 2021-12-16 19:04:17 +08:00
halx99 c463b0fac7 Update README files 2021-11-09 15:59:17 +08:00
halx99 8cb0adfa57 Update README_CN.md 2021-09-14 12:53:22 +08:00
aismann 0baf946df7 Merge: cbeeb8d8ab 3990cc765d 
Merge branch 'adxeproject:dev' into dev
 2021-08-27 07:49:17 +02:00
aismann 6632c5c3f6 Debug 64bit build error 
Severity        Code    Description     Project File    Line    Suppression State
Error (active)  E0075   operand of '*' must be a pointer but has type "bool"    cpp-tests       D:\______\GitHub\adxe\tests\cpp-tests\Classes\SpineTest\SpineTest.cpp   153
 2021-08-27 07:47:22 +02:00
halx99 d6a54f02a0 Update Windows build status badge 2021-08-27 13:27:04 +08:00
halx99 7b5fc4e2a4 Update README_CN.md 2021-08-27 12:45:03 +08:00
halx99 98ab2f6041 Update README_CN.md 2021-07-17 16:14:16 +08:00
halx99 a97ba886bf Rename everything to adxe 2021-07-09 10:42:36 +08:00
halx99 41c8df71c5 Update readme 2021-07-09 10:31:04 +08:00
halx99 e58472901c Sync CMakeLists.txt and README files [skip ci] 2021-07-08 22:55:33 +08:00
halx99 4f85248c27 Update README_CN.md 2021-06-26 17:13:05 +08:00
halx99 3a7d79733f Update readme guide and fixup [ci build] 2021-06-08 21:53:18 +08:00
halx99 56da62d83b Update README_CN.md 2021-06-05 19:11:59 +08:00
halx99 5a9fe68c35 Update readme 2021-05-26 14:46:15 +08:00
halx99 ac180232bf Merge: 7f248efcee 0ffec3873a 
Merge pull request #354 from aismann/patch-1

'adxe'  always lowercase
 2021-05-19 11:42:41 +08:00
aismann 510867c4b3 'adxe' always lowercase 2021-05-19 02:15:21 +02:00
aismann 7745e2a12a 'adxe' always lowercase 2021-05-19 02:14:17 +02:00
halx99 7d307937ce Merge: 67404f2ae6 9b7458806c 
Merge branch 'master' of https://github.com/adxeproject/adxe
 2021-05-18 21:30:54 +08:00
halx99 0a660faaf5 plain glfw lib name 2021-05-18 21:30:42 +08:00
halx99 1128fc6cca Update README_CN.md 2021-05-18 20:24:21 +08:00
halx99 81ba4ec94d Fix readme reference 2021-05-18 20:23:43 +08:00
halx99 96cbcce4b0 Merge: 71ebb455a6 2dd4051cbb 
Merge branch 'master' of https://github.com/adxeproject/adxe
 2021-05-18 18:09:06 +08:00