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

373 Commits

Author SHA1 Message Date
halx99 53700168d6 Add missing -winsdk option 2023-07-02 10:04:00 +08:00
halx99 b30744d2e0 Fix nuget setup & improve source migrate 2023-07-02 01:01:46 +08:00
Deal(涓€绾跨伒) 9ec338e663 Improve build1k.ps1 (#1251) 2023-07-02 00:53:41 +08:00
Deal(涓€绾跨伒) 2ff94f287e Improve ci files (#1247) 
* Improve ci files

* Fixup

* Fix ci

* Update DevSetup.md

* Remove duplicated code

* Fix setup_jdk

* Fix typo

* Check jdk setup

* Update build1k.ps1

* Update build.ps1

* Update build1k.ps1
 2023-07-01 08:52:14 +08:00
halx99 6dc5e3a3e3 Fix typo 2023-06-30 17:26:24 +08:00
halx99 ab6ae71691 Fix ci 2023-06-30 17:20:00 +08:00
halx99 ac3123bdb6 Improve ci pwsh script 
- Rename tools/ci/build.ps1 to tools/ci/build1k.ps1
- build1k.ps1 now also setup jdk for build android
- Rename `-cm` to `-xc`
- Rename `-cb` to `-xb`
- Add option `-prefix` to specific install location for missing tools,
default localtion is $HOME/build1k/
 2023-06-30 17:06:33 +08:00
Deal(涓€绾跨伒) 8a981d7242 Almost pwsh for ci (#1244) 2023-06-29 19:46:52 +08:00
halx99 0a4c247dd2 Migrate sync [skip ci] 2023-06-19 20:09:58 +08:00
Deal(涓€绾跨伒) 145492ae1d Update generate_docs.sh 2023-06-13 20:38:26 +08:00
Deal(涓€绾跨伒) 50e4a82245 Update generate_docs.sh 2023-06-12 12:24:35 +08:00
halx99 20e2a7edcf Fix docs gen 2023-06-12 11:02:17 +08:00
halx99 5612482744 Improve docs gen and fix genbindings 2023-06-12 10:26:08 +08:00
halx99 85111a4cc3 Improve engine version definitions 2023-06-12 09:14:23 +08:00
halx99 448d03f0d2 Improve sources-migrate [skip ci] 2023-06-11 17:48:29 +08:00
halx99 7194dd4de8 Improve sources-migrate [skip ci] 2023-06-11 15:35:18 +08:00
halx99 b13a5a4aab Improve sources-migrate [skip ci] 
- support migrate specific folder
 2023-06-11 15:31:16 +08:00
halx99 2d81db7869 Fix lua bindings 2023-06-11 15:07:31 +08:00
halx99 3a3881ae93 Improve sources-migrate 2023-06-11 14:38:54 +08:00
halx99 279b635405 Fix genbindings 2023-06-11 14:38:34 +08:00
Deal(涓€绾跨伒) abd8029f64 Remove CC prefix from code file name (#1230) 
* Add migrate sources tool

* Fix include replace regex

* Fix compile

* Migrate maually

* Disable sources-migrate tool by default

* Fix ci

* Fix ci

* Improve source migrate

* Fix ios/tvos ci

* Fix ios/tvos ci

* Fix
 2023-06-11 13:08:08 +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 4ea68dd804 [CI] Only build cpp-tests for android 2023-06-06 10:33:00 +08:00
Deal(涓€绾跨伒) 9f98262e10 Update VERSION.txt 2023-05-30 10:19:09 +08:00
halx99 3e9f9317b8 Fix win-ci/build.ps1 for x86 build 2023-04-20 08:11:14 +08:00
halx99 72251dcf86 Improve build.ps1 script 2023-04-02 21:34:45 +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
halx99 9b381c8fb2 Fix #1157 2023-04-02 09:27:56 +08:00
Deal(涓€绾跨伒) b860217be0 Fix #1156 2023-04-02 01:41:00 +08:00
halx99 4494bd2431 Fix #1155 2023-04-02 00:26:03 +08:00
bwaiox 0d812e09ff Fix lua warnning (#1151) 
* Update CMakeLists.txt

fix tmpnam warnning in loslib.c

* Update utils.py

fix error "File "/axmol/tools/console/bin/axmol.py", line 1091, in <module>" when command "axmol new " was used
 2023-04-01 17:31:13 +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
Deal(涓€绾跨伒) 9720265ba6 Update update-prebuilts.ps1 2023-03-21 21:21:02 +08:00
halx99 5e78f5c0db Improve thirdparty updating robot 2023-03-18 00:25:35 +08:00
halx99 517ffeedc6 Update project url in sources 2023-03-12 01:44:55 +08:00
Deal(涓€绾跨伒) 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
Deal(涓€绾跨伒) 4a4d5d19bc Update update-prebuilts.sh 2023-03-09 16:51:09 +08:00
halx99 b377f1238e Tidy lua-template-default 2023-02-24 00:17:36 +08:00
halx99 859d2b0b1b Android CI: signed release apks 2023-02-18 11:26:37 +08:00
Deal(涓€绾跨伒) 492c1705ab Delete README.md 2023-02-15 15:06:53 +08:00
halx99 350a172860 Now lua-binding generator use python3 2023-02-14 23:30:44 +08:00
halx99 233cdd0daf Remove unused 2023-02-14 23:23:11 +08:00
halx99 c85c778cea Remove libclang binaries from repo 2023-02-14 23:10:28 +08:00
CHP dcf2edff5f Update android-ci.yml - upload apk (#1027) 2023-01-12 13:04:38 +08:00
涓€绾跨伒|Deal b5e4bfe8d3 Add windows dll build checks for GH actions (#1023) 
* Update windows-ci.yml

* Update pr-ci.yml

* Update build.ps1

* Update windows-ci.yml

* Update build.ps1
 2023-01-08 22:04:14 +08:00
halx99 429e62ff95 Merge: 427ae694bd b5cde53994 
Merge branch 'dev' of https://github.com/axmolengine/axmol into dev
 2023-01-04 21:26:23 +08:00
halx99 8c9cda5b16 Fix http request issue when path empty from url 
Ensure path can be use for http request directly
 2023-01-04 21:26:01 +08:00
CHP a6b09af092 ANDROID_SDK_ROOT -> ANDROID_HOME (#1009) 
* Update setup.py

* ANDROID_SDK_ROOT -> ANDROID_HOME
 2023-01-04 08:03:48 +08:00
halx99 d238f72820 Fix ci 2023-01-03 14:34:10 +08:00
CHP 9b9566df0b unix-ci use cmake --parallel for all platforms (#982) 
* unix-ci use cmake --parallel for all platforms

+cleanup

* Update run-script.sh
 2022-12-12 02:23:39 +08:00
CHP 65b8f00dc7 Update before-install.sh (#981) 2022-12-11 22:26:24 +08:00
CHP 88a0ac47b6 Update before-install.sh (#980) 2022-12-11 22:25:54 +08:00
涓€绾跨伒|Deal 0d060467b7 Update run-script.sh 2022-11-10 23:28:15 +08:00
涓€绾跨伒|Deal e457821ce7 Fix tvos ci (effekseer require tvos-14.5) 2022-11-01 18:23:27 +08:00
涓€绾跨伒|Deal c818d155fa Update run-script.sh 2022-11-01 17:35:00 +08:00
halx99 9d2aba2b00 Fix ci 2022-11-01 12:12:13 +08:00
涓€绾跨伒|Deal 29014d0ac8 Merge: f10e63c24d f1a2c04672 
Merge pull request #942 from axmolengine/remove-search-resolutions-support

Remove  FileUtils::searchResolutionsOrderArray
 2022-11-01 06:48:57 +08:00
涓€绾跨伒|Deal 6ddd6f0e05 Update CMakeLists.txt 2022-11-01 06:47:36 +08:00
涓€绾跨伒|Deal 3b3a709e40 Eanble efeekseer ci checks for apple platforms 2022-10-31 21:48:52 +08:00
halx99 0715477d4c Enable live2d and effekseer extension ci checks 2022-10-31 14:35:42 +08:00
涓€绾跨伒|Deal 7f6b6dfad4 Update update-prebuilts.sh 2022-10-23 11:06:20 +08:00
halx99 6c90d7b7be Update script file 2022-10-22 20:02:36 -07:00
涓€绾跨伒|Deal ee12fa2ff5 Update script [skip ci] 2022-10-22 23:54:40 +08:00
halx99 2e0ae58377 Add update thirdparty prebuilt script [skip ci] 2022-10-22 07:49:36 -07:00
涓€绾跨伒|Deal 25d93bd509 Improve code quality (stage1.Oct) (#916) 
* Improve code quality

* Add env PULL_REQUEST [skip ci]

* Update build.ps1

* Fix ci [skip ci]

* Update ZipUtils.cpp

* Update build.ps1

* Resolve reviews

* Improve

* Improve code style

* Resolve reviews

* Use pod_vector

* Improve resize growth

* Update CCAnimation3D.cpp

* Update axstd.h [skip ci]
 2022-10-13 21:44:42 +08:00
halx99 567069236b Luabinding: Add std:🧵:id support 2022-10-12 14:22:45 +08:00
涓€绾跨伒|Deal 1a0a70326c Merge: 27206fdc79 92cd2ee005 
Merge pull request #898 from crazyhappygame/patch-2

Delete setup_android.py
 2022-10-06 08:56:49 +08:00
涓€绾跨伒|Deal f72f18ce64 Merge: 6220071b3b 97fc3b7bcf 
Merge pull request #896 from crazyhappygame/patch-1

Enable C++20 by default
 2022-10-06 08:50:39 +08:00
CHP e654e9b9a0 Update run-script.sh 2022-10-05 21:20:53 +02:00
CHP 06fc6140a7 Update before-install.sh 2022-10-05 21:19:47 +02:00
CHP 026e694b5f Delete setup_android.py 
This file is not needed with latest android SDK
 2022-10-05 21:18:06 +02:00
涓€绾跨伒|Deal 48a7da97d6 Final migrate (#876) 2022-10-01 16:24:52 +08:00
tkzcfc 5f8b96d607 export 'setAttachment' function to lua (#868) 
* export: sp.SkeletonAnimation:findBone sp.SkeletonAnimation:getBoundingBox

* export 'setAttachment' function to lua

Co-authored-by: tkzcfc <tkzcfc@users.noreply.github.com>
 2022-09-27 19:15:11 +08:00
halx99 32a6a2b1ac Fix ci [skip ci] 2022-09-26 23:15:59 +08:00
halx99 484feb99f3 Migrate lua bindings generator 2022-09-26 23:01:09 +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
涓€绾跨伒 c6fc93abbc Update README.md 2022-08-18 09:13:09 +08:00
unknown 9a9025aede Add empty check 2022-08-16 15:12:45 +05:30
halx99 6d5e50ded9 Avoid unnecessary double lookup 2022-08-16 17:14:06 +08:00
unknown 9968a7ddcb Add support for width & height in percentage for RichElementImage 2022-08-16 12:09:02 +05:30
涓€绾跨伒 a5ee1f0a98 Feature 803 (#804) 
* Improve libpng cmake script to allow osx-arm64 target

* Update run-script.sh

* Update osx-ci.yml

* Update pr-ci.yml

* Update android-ci.yml

* Update pr-ci.yml

* Update osx-ci.yml

* Update README.md

* Update README.md

* Update libs

* Use macos-12 for osx target

* Fix ci
 2022-08-14 11:19:56 +08:00
halx99 be779ec61a Fi ci 2022-08-09 09:48:03 +08:00
涓€绾跨伒 b80c469383 Fix ci 2022-08-08 22:22:34 +08:00
涓€绾跨伒 9892aa3d1c Migrate axys (#782) 2022-08-08 18:02:17 +08:00
halx99 1009b29a06 Fix andorid ci 2022-08-06 22:10:56 +08:00
halx99 714d814288 Improve android setup tools 
- Rename ANDROID_SDK to ANDROID_SDK_ROOT, refer to: https://developer.android.google.cn/studio/command-line/variables
- CMake: Use ndk in sdk_root/ndk/xxx/
 2022-08-06 22:02:58 +08:00
halx99 827dd3351a Sync android sdk build-tools version for setup_android.py 
Match with Android Gradle Plugin 7.2.0
 2022-08-06 19:23:41 +08:00
halx99 c09871e6b2 Sync axis cmdline stat default value [skip ci] 2022-08-06 18:26:47 +08:00
涓€绾跨伒 17716d853b Fix android ci 
Overwrite deprecated env to avoid use unexpected android sdk
 2022-08-02 19:17:16 +08:00
halx99 ce2494ea35 Fix android ci 2022-08-02 18:49:19 +08:00
涓€绾跨伒 83d7e2e75e Update setup_android.py 2022-08-02 18:07:00 +08:00
tkzcfc 839097ed95 [Lua Binding] Support return type 'ResourceData' (#763) 2022-07-22 13:13:22 +08:00
halx99 2c6fde019b Migrate macro COCOS2D_DEBUG, refer #751 2022-07-19 15:34:26 +08:00
halx99 c16a33e347 Migrate more macors 2022-07-16 10:43:05 +08:00
涓€绾跨伒 ac1872494c Remove unnecessary check [skip ci] 
refer to #748
 2022-07-15 19:44:31 +08:00
halx99 41d2c44308 Migrate macros 'CC_' to 'AX_' 2022-07-15 19:17:01 +08:00
涓€绾跨伒 b7467da607 Migrate extension lua (#747) 2022-07-12 21:31:54 +08:00
涓€绾跨伒 bf77f46dce Migrate engine namespace to `axis`(abbv: `ax`) (#743) 2022-07-11 17:50:21 +08:00
涓€绾跨伒 9b4a7b1446 Merge: 04ca16125b 9ee4181976 
Merge pull request #739 from axis-project/migrate-engine-test-extension-config

Migrate tests, extensions and configs
 2022-07-10 09:47:41 +08:00
涓€绾跨伒 d4c4d395a5 Merge: 18076d09f0 2f8d5dd2f6 
Merge pull request #738 from solan-solan/index_array_to_stl

IndexArray to stl
 2022-07-10 09:47:27 +08:00
halx99 c2acb3a744 Migrate tests, extensions and configs ReSquash for unexpected changes +2 2022-07-09 22:23:34 +08:00
halx99 60bd088129 Update tool scripts and delete unused file 2022-07-08 17:56:04 +08:00
DelinWorks 90053545eb Fix project creation tools. 2022-07-08 07:22:29 +03:00
DelinWorks 3d47f2aa91 Finally fix .gitignore [skip ci] 2022-07-07 15:51:47 +03:00
DelinWorks 67c43b84ea Update .gitignore 2022-07-07 15:32:12 +03:00
DelinWorks 14593030d1 Update .gitignore 2022-07-07 15:31:33 +03:00
DelinWorks 977d1f01a0 Rename build toolchain. 2022-07-07 15:29:23 +03:00
涓€绾跨伒 e6ae7c44b3 Merge: 555f847c1f 6dd8b2c74a 
Merge pull request #702 from DelinWorks/improve-engine-types

[PROPOSAL] Move global enums to their own file.
 2022-07-05 00:39:20 +08:00
DelinWorks 96158090db Add stride functions and remove unneeded UNSPEC value. 2022-07-04 19:20:04 +03:00
DelinWorks 7e199cce21 Update lua_cocos2dx_auto.cpp 2022-07-04 18:34:50 +03:00
halx99 a31ba3caae Improve meshdata load 
- Avoid GC alloc when store indices
- Fix indices iterator by IndexArray::for_each
 2022-07-04 23:23:33 +08:00
DelinWorks 0d9f8d8d5d Fix compilation. 2022-07-04 17:55:41 +03:00
halx99 7f9511358f Fix warnings 2022-07-01 13:47:47 +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
Turky Mohammed d0b551d26b Merge: 6e1d48835e 193ed82788 
Merge branch 'adxeproject:dev' into partical-system-animation
 2022-05-23 16:55:30 +03:00
DelinWorks 5239256b13 Improve particle RNG and add useful functions 
Replaced M11 RNG with KISS RNG which is better and fixes a problem with particle strafing, added the ability to pause the entire particle system (useful for pause menus) and ability to control particle system time speed multiplier 馃挭馃ザ
 2022-05-23 16:04:09 +03:00
halx99 6d48aa055c Fix github ci scripts 2022-05-23 17:11:10 +08:00
halx99 dffaf9b8d7 Enable video & webview lua-tests on windows 2022-05-18 12:52:05 +08:00
涓€绾跨伒 2623d53b98 Try fix windows ci 2022-04-24 20:08:48 +08:00
halx99 7f27ca033e Sync lua bindings 2022-02-24 18:53:14 +08:00
halx99 7ce188ebda Finish #578 2022-02-17 17:11:17 +08:00
deal 1a4fc33daf Enable ImGUIExt check for linux [skip ci] 2022-02-03 15:43:40 +08:00
deal 8dd0aef742 Update setup_android.py 2022-01-28 20:25:58 +08:00
deal b7b29dc315 Update script prompt [skip ci] 2022-01-28 20:18:46 +08:00
deal 7fa220daa2 Update setup_android.py 2022-01-28 20:17:28 +08:00
deal 115634a37e Delete jdk setup on script [skip ci] 2022-01-28 15:19:56 +08:00
deal bac28c62f5 [ci] Add openjdk17 to PATH 2022-01-28 15:04:23 +08:00
deal 33a7836d0d print jdk version [skip ci] 2022-01-28 15:01:42 +08:00
deal d5347ce7f5 [ci] Install openjdk17 for android build 2022-01-28 14:53:36 +08:00
deal c053848f57 Optimize setup_android.py and update cmdlinetools 
Update cmdlinetools revision to 8092744
 2022-01-28 11:52:02 +08:00
deal c424d7b8b0 Build fairygui-tests for android ci 2022-01-08 00:08:12 +08:00
halx99 5031f8f54c Sync console scripts 2022-01-03 19:06:51 +08:00
halx99 74271f207b Tidy audio folder 2022-01-03 11:34:58 +08:00
deal 1889bcc229 Update genbindings.ps1 2022-01-01 21:56:55 +08:00
halx99 8beea3967f Fix ci 2021-12-31 16:29:11 +08:00
halx99 f80ddd3505 Fix ci [skip ci] 2021-12-31 15:49:45 +08:00
halx99 def5f9e2bc Rename core folder name 2021-12-31 14:39:08 +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 e726066595 Tidy tools 2021-12-30 21:24:22 +08:00
halx99 fb5c2926af Tidy ci scripts 2021-12-30 20:15:42 +08:00
deal bfb1c9199e Update before-install.sh 2021-12-30 20:09:25 +08:00
halx99 af52e6b6bb Tidy ci scripts 2021-12-30 19:40:30 +08:00
halx99 11c83ea1cf Optimize ci scripts [skip ci] 2021-12-30 17:47:01 +08:00
halx99 24a70b0fb0 Update lua bindings config files 2021-12-30 12:53:37 +08:00