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

41 Commits

Author SHA1 Message Date
涓€绾跨伒 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
涓€绾跨伒 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
涓€绾跨伒 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
涓€绾跨伒 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 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 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 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 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