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

228 Commits

Author SHA1 Message Date
halx99 33afe5470a Merge: 55cd8253f6 b161985934 
Merge branch '1.x' into dev
 2023-08-25 16:52:26 +08:00
halx99 46f668b01b Remove render backend setLineWidth [skip ci] 
Due to not all of GL and Metal support it, so remove it unify behavior
developers shouldn't relay on it
 2023-08-25 16:49:08 +08:00
halx99 f525d6c726 Update docs 2023-08-25 16:46:32 +08:00
halx99 698b26f4db Merge: 663ff8c493 5f6ffecc92 
Merge branch '1.x' into dev
 2023-08-15 18:03:41 +08:00
halx99 bfe167121e Add cmake option AX_GLES_PROFILE 
Valid value of AX_GLES_PROFILE: 0, 200, 300

By default, the AX_GLES_PROFILE is:

- android: 200, allow axmol apps runs on: API 17 Android 4.2+ devices
- winuwp: 300
- Win32/linux/osx/ios/tvos: 0

For ios/tvos, will forcing AX_GLES_PROFILE to 300 if AX_GLES_PROFILE not 0
 2023-08-14 20:40:05 +08:00
Deal 9dc9e9adc7 Update android.yml 2023-08-13 23:58:18 +08:00
halx99 bd0e1fef4b Fix compile error 2023-08-13 22:09:02 +08:00
halx99 9b6f1b38fa Enable ci on 1.x branch 2023-08-13 00:26:52 +08:00
Deal 572bb2f700 Test use glad on android 2023-08-13 00:24:35 +08:00
Deal b228718022 Update pr.yml 2023-08-11 22:48:22 +08:00
halx99 bdca88e46d Update ci script 2023-08-11 21:45:43 +08:00
halx99 a726bdd965 Update cpr branch 2023-08-11 18:58:50 +08:00
halx99 65ebdafbbe Update thirdparty libs 
- llhttp: 8.1.1 --> 9.0.0
- xxhash: 0.8.1 --> 0.8.2
- yaml-cpp: 0.7.0 --> 0.8.0
 2023-08-11 18:20:20 +08:00
Deal(涓€绾跨伒) 2f2ace9dbd Reduce pull-request ci jobs 2023-07-15 22:39:32 +08:00
halx99 177c845cc6 Don't setup glslcc and include it in main branch 2023-07-15 00:54:20 +08:00
halx99 d3232a2fad Fix linux ci 2023-07-06 12:22:41 +08:00
halx99 1c25aea206 Reduce ci checks 2023-07-01 21:54:12 +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 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 ac8deafa3c Fix pr ci 2023-06-24 11:54:33 +08:00
Deal(涓€绾跨伒) feffe4095c Update 3rd sources (#1240) 
- llhttp: 8.1.1
- yasio: latest
- recast 1.6.0
- openal-soft: latest for official UWP support
- glad 2.0.4
- libpng 1.6.40
- astcenc 4.5.0
- Add fastlz: latest
- Disable lz4 by default
 2023-06-24 09:17:14 +08:00
halx99 6d240c5b8b Improve gendocs 2023-06-13 00:17:01 +08:00
Deal(涓€绾跨伒) 1bd4b190d8 Update docs.yml 2023-06-12 11:25:23 +08:00
Deal(涓€绾跨伒) f80f35b652 Update docs.yml 2023-06-12 11:15:47 +08:00
halx99 5612482744 Improve docs gen and fix genbindings 2023-06-12 10:26:08 +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 dc4e141387 Update readme & ci files 2023-03-25 11:18:21 +08:00
halx99 9bd9bb5714 Update ci: setup-python step 2023-03-25 11:14:51 +08:00
halx99 5e78f5c0db Improve thirdparty updating robot 2023-03-18 00:25:35 +08:00
halx99 8237960c1f Fix osx-ci.yml 
Don't set cmake version which may not present on target action vm
 2023-03-12 19:26:36 +08:00
halx99 eadd53f366 Improve winuwp-ci 2023-03-12 02:42:32 +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(涓€绾跨伒) e8d63fd992 Update workflow files 2023-02-25 03:06:54 +00:00
Deal(涓€绾跨伒) 0ae5a3e91a Update update-prebuilts.yml 2023-02-16 06:25:35 +08:00
CHP 8174cc85ce Update android-ci.yml (#1029) 2023-01-14 08:24:55 +08:00
CHP dcf2edff5f Update android-ci.yml - upload apk (#1027) 2023-01-12 13:04:38 +08:00
Deal(涓€绾跨伒) 9ebb363802 Update pr-ci.yml 2023-01-12 11:38:08 +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 f7b8c6528a Fix #991 2023-01-03 15:09:45 +08:00
halx99 d238f72820 Fix ci 2023-01-03 14:34:10 +08:00
涓€绾跨伒|Deal 1ae07227eb Add vs2019 test ci 2023-01-03 12:33:24 +08:00
涓€绾跨伒|Deal c59badc336 Update update-prebuilts.yml 2022-10-23 15:47:15 +08:00
涓€绾跨伒|Deal 4baf6a981a Update pr-ci.yml 2022-10-23 13:32:18 +08:00
涓€绾跨伒|Deal 391984bcb9 Update update-prebuilts.yml 2022-10-23 13:10:45 +08:00
涓€绾跨伒|Deal c5e3d4f7e6 Update update-prebuilts.yml 2022-10-23 12:38:54 +08:00
涓€绾跨伒|Deal c72f382cd3 Update update-prebuilts.yml 2022-10-23 00:19:06 +08:00
涓€绾跨伒|Deal 17f19a3547 Update update-prebuilts.yml 2022-10-22 23:48:29 +08:00
涓€绾跨伒|Deal 92d58f9b70 Update update-prebuilts.yml 2022-10-22 23:26:32 +08:00
halx99 be48054605 Add action to update thirdparty prebuilts 2022-10-22 23:21:38 +08:00
halx99 2b2e214ffe Update gh action files 2022-10-20 22:20:33 +08:00
涓€绾跨伒|Deal 94caf8d36d Update windows-ci.yml 2022-10-13 23:16:25 +08: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
涓€绾跨伒|Deal 9990f693a6 Update clang-format.yml 2022-09-24 13:36:32 +08:00
halx99 ea1b70288d Update thirdparty libs 
fmt: 9.0.0 --> 9.1.0
llhttp: 6.0.7 --> 6.0.9
astc-encoder: 4.0.0 --> 4.1.0
webp: 1.2.2 --> 1.2.4
flatbuffers: 2.0.0 --> 2.0.8
 2022-09-15 20:15:28 +08:00
halx99 25ba618050 Update windows-ci 2022-09-12 23:09:31 +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
涓€绾跨伒 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
halx99 d42e6b22b6 Update gh actions config files 2022-08-16 08:26:20 +08:00
涓€绾跨伒 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 68a205f9d3 Fix osx/ios ci 2022-08-11 13:08:14 +08:00
涓€绾跨伒 72f689e38d Update genbindings-ci.yml 2022-07-19 18:50:49 +08:00
halx99 cf40f6e0c2 Update ci ignore [skip ci] 2022-07-15 18:51:17 +08:00
halx99 05805987d5 Sync docs for namespace migrate 2022-07-15 18:40:42 +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
涓€绾跨伒 20900f2065 Merge: f02410f81b f15dc098e6 
Merge pull request #730 from DelinWorks/migrate-engine-name

Fix engine setup files.
 2022-07-08 15:34:23 +08:00
DelinWorks 455be5d2ac Fix python setup file. 2022-07-07 14:37:59 +03:00
halx99 7d245700be Fix gh actions syntax 2022-07-07 17:45:52 +08:00
halx99 f11930eb08 Auto ignore all *.md files for ci 2022-07-07 17:42:45 +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
涓€绾跨伒 fc2d2e5e50 Update genbindings-ci.yml 2022-06-09 17:14:10 +08:00
涓€绾跨伒 4a835f8fab Update genbindings-ci [skip ci] 2022-06-09 17:05:46 +08:00
涓€绾跨伒 c6619c60c6 Update genbindings-ci.yml 
perform pull before push
 2022-06-09 17:02:41 +08:00
涓€绾跨伒 dcc6071fa2 Update docs-ci.yml 2022-05-19 13:54:02 +08:00
涓€绾跨伒 5520e026fe Update windows-ci.yml 2022-04-24 21:35:29 +08:00
涓€绾跨伒 a1352a8170 Try fix windows ci 2022-04-24 20:09:55 +08:00
halx99 0043b61eb0 Merge: d8b858203e 8e7a59a0d4 
Merge branch 'dev' of https://github.com/adxeproject/adxe into dev
 2022-02-24 19:02:42 +08:00
halx99 58281f4145 Fix linux ci 2022-02-24 19:00:49 +08:00
deal c5eaa07f4a Update genbindings-ci.yml 2022-02-24 18:55:19 +08:00
halx99 a1b40c61ea [ci] Setup openjdk with github action 2022-01-28 15:27:17 +08:00
deal 6031fdda11 Update android-ci.yml 2022-01-08 00:09:50 +08:00
deal 6b94191d82 Update genbindings-ci.yml 2022-01-01 22:01:29 +08:00
deal 3861a15be6 Auto commiting genbinding chnages 2022-01-01 21:27:39 +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 ddedf1e113 Update linux-ci.yml 2021-12-30 19:56:07 +08:00
deal 2581aaf19b Update pr-ci.yml 2021-12-30 19:53:30 +08:00
halx99 af52e6b6bb Tidy ci scripts 2021-12-30 19:40:30 +08:00
halx99 fa6617b8a8 Fix ci 2021-12-30 17:56:35 +08:00
halx99 11c83ea1cf Optimize ci scripts [skip ci] 2021-12-30 17:47:01 +08:00
deal a813aac10e Merge: 6639f55c0f bec2e07a00 
Merge pull request #561 from adxeproject/dev

Merge Crash Fix #559 from dev
 2021-12-28 21:27:32 +08:00
halx99 13927aa1bc Fix #559, match number type for get CURLINFO_RESPONSE_CODE 
a. On linux x64, will crash with stack protector

Reported by @rh101

Signed-off-by: halx99 <halx99@live.com>
 2021-12-28 21:00:45 +08:00