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

169 Commits

Author SHA1 Message Date
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
deal ae4268a736 Update clang-format.yml 2021-12-28 16:03:49 +08:00
deal 47720c429a Update clang-format.yml 2021-12-28 16:00:18 +08:00
halx99 6bba4ce24b Merge: d397854ead 9eeeb151a1 
Merge commit
 2021-12-28 11:07:12 +08:00
halx99 c93849c6de Commit chnages 2021-12-28 11:05:34 +08:00
deal 0bd37c8875 Update clang-format.yml 2021-12-28 10:57:56 +08:00
deal dc2f821a58 Update clang-format.yml 2021-12-25 10:00:26 +08:00
deal 6459318039 Update clang-format.yml 2021-12-25 09:53:34 +08:00
deal 6b876c51ea Update clang-format.yml 2021-12-25 00:35:40 +08:00
deal 391305ca9e Create clang-format.yml 2021-12-24 20:16:30 +08:00
halx99 e83c8b1c08 Merge: b5e1e78417 53272c6532 
Merge pull request #504 from adxeproject/freetype-sdf

Replace SDF implementation with freetype
 2021-09-20 18:24:11 +08:00
halx99 01f34d1e74 Fix mac build [skip ci] 2021-09-20 18:18:52 +08:00
halx99 cd67d2f3cc Update pr-ci.yml 2021-09-20 16:18:08 +08:00
halx99 3580070f62 Update linux-ci.yml 2021-09-20 16:16:41 +08:00
halx99 0e1e2663e0 Update pr-ci.yml 2021-09-17 16:10:46 +08:00
halx99 53ac32b74a Update pr-ci.yml 2021-09-17 16:09:00 +08:00
halx99 3b424f75e5 Update windows-ci.yml 2021-08-27 12:39:49 +08:00
halx99 73c5f887b5 Merge: 30625f2330 f5af50debd 
Merge pull request #475 from adxeproject/win64

Win64 build support [DONE] 馃殌馃帀
 2021-08-27 12:34:24 +08:00
aismann 147b4b7946 Update README.md 2021-08-27 06:25:18 +02:00
halx99 08526c36c3 Update windows-ci.yml 2021-08-27 01:52:34 +08:00
halx99 5f0d24e545 Update pr-ci.yml 2021-08-27 01:52:03 +08:00
halx99 86e7b1da1b Update pr-ci.yml 2021-08-27 01:51:02 +08:00
halx99 b944332f03 Update windows-ci.yml [skip ci] 2021-08-27 01:31:35 +08:00
halx99 2ade93bc1e Rename windows ci [skip ci] 2021-08-27 01:20:07 +08:00
halx99 08b1f4b2cc Update docs-ci.yml 2021-07-07 13:13:31 +08:00
halx99 350e1c5b07 Update docs-ci.yml 2021-07-07 12:46:37 +08:00
halx99 92621e1428 Update docs-ci.yml 2021-07-07 12:42:09 +08:00
halx99 5d87607057 Update pr-ci.yml 2021-07-07 12:41:15 +08:00
halx99 58bd65348f Update docs-ci.yml 2021-07-07 12:26:06 +08:00
halx99 56a13f0f73 Update docs-ci.yml 2021-07-07 11:05:21 +08:00
halx99 59703c550e Update docs-ci.yml 2021-07-07 11:01:55 +08:00
halx99 1521ca17dc Refine ci [skip ci] 2021-07-07 10:52:45 +08:00
halx99 bf0edfec27 Update win32-ci.yml 2021-07-07 02:43:37 +08:00
halx99 547686f475 Update osx-ci.yml 2021-07-07 02:43:19 +08:00
halx99 e8b25cf1d8 Update linux-ci.yml 2021-07-07 02:43:01 +08:00
halx99 d0b036d9a5 Update ios-ci.yml 2021-07-07 02:42:37 +08:00
halx99 8abb9a4a1c Update docs-ci.yml [skip ci] 2021-07-07 02:42:04 +08:00
halx99 01da482228 Refine ci [skip ci] 2021-07-07 02:39:53 +08:00
halx99 76c367557e By default, skip merge pull request commit 2021-07-06 21:13:15 +08:00
halx99 8c60e823c1 Update docs-ci.yml [skip ci] 2021-07-06 15:23:55 +08:00
halx99 e6ddbf74f7 Update docs-ci.yml 2021-07-06 14:42:42 +08:00
halx99 014680a590 Create docs-ci.yml 2021-07-06 14:40:51 +08:00
halx99 452b6a43df Refine ci 2021-07-05 14:31:42 +08:00
halx99 9454d438f4 Refine android-ci.yml 2021-07-04 22:11:15 +08:00
halx99 dc1a358597 Refine ci 2021-07-04 22:09:49 +08:00
halx99 88fa79e6b6 Refine ci config files 2021-07-04 22:05:36 +08:00
halx99 ccbe31c449 Update pr-ci.yml 2021-06-07 17:28:50 +08:00
halx99 3e49fba5b5 Enable lfs files download for github actions [ci build] 2021-06-06 01:12:41 +08:00
halx99 0b9648d0b8 Fix github action for linux with lfs file download [ci build] 2021-06-06 01:03:13 +08:00
halx99 dffd258ce1 Enable all supported arch for android [ci build] 2021-06-05 01:30:49 +08:00
halx99 21e48bbdbe Build win32 Debug and Release [ci build] 2021-06-02 05:43:20 +08:00
halx99 e220ecd7a5 Fix pull-request linux ci 2021-05-24 21:43:06 +08:00
halx99 93dee537b7 Also build lua-tests on win32 [ci build] 2021-05-24 16:41:39 +08:00
halx99 905d101dd8 Fix linux build action [ci build] 
We simply upgrade to ubuntu-20.04 since github action ubuntu-18.04 broken on 2021.5.1X
 2021-05-11 11:30:00 +08:00
halx99 60521eaf68 Fix linux build action [ci build] 
https://github.com/actions/virtual-environments/issues/323
 2021-05-11 10:45:18 +08:00
halx99 0b805564dc CI don't needs download deps manually [ci build] 2020-11-16 16:02:47 +08:00
halx99 b8a3de050f Try bionic for android ci 2020-11-12 18:07:52 +08:00
halx99 052558e83d Merge: 5da2894e1b f80a6ef25c 
Merge branch 'master' of https://github.com/c4games/engine-x into master
 2020-11-08 13:12:06 +08:00
halx99 c98313ac4b Prepre for box2d-2.4.1 2020-11-08 13:11:40 +08:00
halx99 6c09438b38 Add cmake option -DLUA_ENGINE=luajit to switch lua engine to luajit [ci build] 2020-11-07 10:36:22 +08:00