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

284 Commits

Author SHA1 Message Date
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
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
halx99 4ea331fb20 string_view for lua bindings 2021-12-28 15:46:32 +08:00
halx99 c9159c62fa Delete unused binding generator 2021-12-08 00:15:08 +08:00
halx99 a95f3bc32a Fix #528 2021-10-27 10:27:46 +08:00
halx99 2bd82c11bd Fix ci 2021-10-25 20:29:40 +08:00
halx99 7477b4f534 Fixup 2021-09-20 17:22:15 +08:00
halx99 75af319e25 Update before-install.sh 2021-09-20 17:06:01 +08:00
halx99 476bf5a480 Update before-install.sh 2021-09-20 16:47:44 +08:00
halx99 0cee74a4bf Fix part of #487 2021-09-02 11:43:27 +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 824130acc4 Enable lua-tests build for ci 2021-08-27 11:42:43 +08:00
halx99 63cfa97024 Update build.ps1 2021-08-27 08:02:03 +08:00
halx99 008c2b9be4 Rename tools/windows-ci/windows-ci/windows-ci/build.ps1 to tools/windows-ci/build.ps1 2021-08-27 01:43:07 +08:00
halx99 34083069f3 Create build.ps1 2021-08-27 01:42:32 +08:00
halx99 de54082c76 Update lua bindings 2021-08-14 13:22:03 +08:00
halx99 fd9422d36d Update lua bindings 2021-08-13 20:36:10 +08:00
halx99 5ee960a0b3 Update run-script.sh 2021-07-09 10:35:57 +08:00
halx99 cbb1df02c4 Improve Lua RTTI performance [ci build] 2021-06-18 12:23:10 +08:00
halx99 9ed3be94c0 Fix for luabinding generator [ci build] 2021-06-18 11:31:07 +08:00
halx99 3a7d79733f Update readme guide and fixup [ci build] 2021-06-08 21:53:18 +08:00
halx99 20f31af61d Restore prebuilt libs from git lfs storage 
You鈥檝e used 100% of your data plan for Git LFS on the organization adxeproject. Please purchase additional data packs to cover your bandwidth and storage usage:
https://github.com/organizations/adxeproject/billing/data/upgrade
Current usage as of 05 Jun 2021 06:46PM UTC:
Bandwidth: 1.01 GB / 1 GB (101%)
Storage: 0.16 GB / 1 GB (16%)
 2021-06-06 10:16:44 +08:00
halx99 12a12a618d Use git lfs manage prebuilt libs 2021-06-05 19:26:40 +08:00
halx99 e1862c28b0 Update run-script.sh 2021-06-05 01:22:33 +08:00
halx99 bf60323b76 Python support for win32 adxe compile command 2021-05-27 17:23:03 +08:00
halx99 827d384eef Renaming refactor (#353) [ci build] 2021-05-18 16:40:30 +08:00
halx99 07a2d3f81f Add some comment 2021-05-15 11:54:17 +08:00
halx99 821492ad8d Fix linux ci 2021-05-15 01:00:20 +08:00
halx99 7aaeb8007d Fix ci [ci build] 2021-05-15 00:44:30 +08:00
halx99 4d7d323eb3 Fix ci [ci build] 2021-05-15 00:33:38 +08:00
halx99 4a12425a1b Fix android ci [ci build] 2021-05-15 00:12:41 +08:00
halx99 8e6faac1f1 Merge: 3348f10813 3a7bb58045 
Merge pull request #350 from rh101/fix-cmake-set-property

Fix for CMake error when set_property is called with aliased target
 2021-05-05 19:49:30 +08:00
rh101 c3618f8ea6 Extract real target from ALIAS if it exists in order to set property successfully 
Remove duplicate entries in dependencies lists
 2021-05-05 16:04:06 +10:00
halx99 a7577ba4c7 Merge: d8367d9376 3a3c4ed518 
Merge pull request #348 from c4games/dev

Merge dev to master
 2021-04-28 04:47:16 -07:00
halx99 70f8393b8f Update install-deps-linux.sh 2021-04-28 19:14:44 +08:00
halx99 30ca89005f Update setup_android.py 2021-04-28 17:56:40 +08:00
halx99 69d2631389 Sets ndk minimum required version to r19c [ci build] 2021-04-28 17:48:26 +08:00
rh101 95cf5b5c2b Merge: 2aa2d69151 b7506fed0c 
Merge branch 'vfs-support' of https://github.com/rh101/engine-x into vfs-support
 2021-04-23 00:01:47 +10:00
rh101 54ffa13dff Move PosixFileStream class to its own files 
Update UserDefault to work with FileStream
Fix undefined openFileStream on platforms other than Win32
 2021-04-23 00:01:32 +10:00
RH 1e15ed4839 Merge: 2cef9f2e76 844119d162 
Merge pull request #3 from c4games/master

Sync with master
 2021-04-22 21:48:49 +10:00
rh101 7540c06fd3 Use FileStream to write JPG images to disk 2021-04-22 21:36:26 +10:00
halx99 8ed6d34234 Explicit set cmake minimum version at app/build.gradle [ci build] 2021-04-22 11:40:53 +08:00
rh101 2bf12b2226 Add support for virtual file system via custom FileStream and FileUtils implementations. 2021-04-22 03:15:49 +10:00
halx99 569edd09e1 Use cmdline-tools instead sdk-tools [ci build] 2021-04-20 22:35:29 +08:00
halx99 96aea0ae6e Use cmdline-tools instead sdk-tools [ci build] 2021-04-20 22:30:39 +08:00
halx99 3ea8e50d90 Use cmdline-tools instead sdk-tools [ci build] 2021-04-20 21:39:42 +08:00
halx99 0c87f1d4ef Use cmdline-tools instead sdk-tools [ci build] 2021-04-20 21:02:55 +08:00
halx99 92e0eff6df Use cmdline-tools instead sdk-tools [ci build] 2021-04-20 20:58:09 +08:00
halx99 98152f235b Use cmdline-tools instead sdk-tools [ci build] 2021-04-20 20:46:32 +08:00
halx99 76646692fc Use cmdline-tools instead sdk-tools [ci build] 2021-04-20 20:44:12 +08:00
halx99 e6467fac7b Refine somethings & improve command cocos python3 support [ci build] 
a. Change android sdk root env var to `ANDROID_SDK`
b. Change android ndk root env var to `ANDROID_NDK`
 2021-04-20 16:13:48 +08:00
halx99 366636e861 Update before-install.sh [ci build] 2021-04-08 23:32:34 +08:00
halx99 c14dafcbaa Update before-install.sh [ci build] 2021-04-08 23:28:46 +08:00
halx99 e05c59f7e1 Update before-install.sh [ci build] 2021-04-08 23:08:05 +08:00
halx99 984c164c57 Sync yasio to 3.35.0 [ci build] 2020-12-21 18:12:13 +08:00
aismann f38b271650 Update controller.cpp 
"Node: Physics" using Chipmunk2D (hardcoded on e.g.: CCPhysicsBody.cpp)

Maybe a Wiki entry is also usefull?
 2020-12-20 07:11:13 +01:00
halx99 b92c3d30c4 Update lua bindings source [ci build] 
cxx17::string_view support
 2020-12-16 17:52:17 +08:00
halx99 eb2917fbf6 Merge: d467b647e2 29819491f7 
Merge branch 'master' of https://github.com/c4games/engine-x
 2020-12-16 12:47:04 +08:00
halx99 14f38d0ebc Sync luabinding config file 2020-12-16 12:46:37 +08:00
halx99 808fdd6494 Update README.md 2020-12-16 12:33:22 +08:00
halx99 0b805564dc CI don't needs download deps manually [ci build] 2020-11-16 16:02:47 +08:00
halx99 e132a37b2b fix android nasm version print for ci [ci build] 2020-11-12 18:01:27 +08:00
halx99 efb1474aa7 Install nasm for ci [ci build] 2020-11-12 17:48:31 +08:00
halx99 5a4d0139c5 fix cjson can't use 2020-11-11 15:21:29 +08:00
halx99 ca9608e98a fix android ci [ci build] 2020-11-09 19:40:43 +08:00
halx99 58e8038ce9 fix ci [ci build] 2020-11-09 18:27:52 +08:00
halx99 98e2af183b Update run-scripts.sh [ci build] 2020-11-09 17:53:23 +08:00
halx99 47603f0ac6 Now, the lua binding generator should works [ci build] 2020-11-02 16:47:33 +08:00
halx99 6fb929c84f Sync readme files 2020-11-02 16:40:05 +08:00
halx99 970b2b3a58 Sync tolua template file 2020-11-02 16:38:08 +08:00
halx99 858d600a16 tolua mutli search paths support 2020-11-02 16:37:18 +08:00
halx99 37c64c5971 Sync config files 2020-11-02 12:50:51 +08:00
halx99 d6ca464614 Optimize python scripts 2020-11-02 11:35:44 +08:00
halx99 3835174a45 Sync folder for binding generator config 2020-11-01 20:18:50 +08:00
halx99 f55c974d18 Build android arch arm64-v8a only for ci, fix test case compiling warning 2020-10-26 11:12:55 +08:00
halx99 7b046814fc Migrate to github ci (#247) 2020-10-24 18:41:20 +08:00
halx99 97fe5954de Python3 no raw_input 2020-10-21 21:37:45 +08:00
halx99 2b52ce5613 Remove unused plugin_jscompile 2020-10-21 21:07:23 +08:00
halx99 2c884eb6df Also replace so name for proj.android when new project 2020-10-20 16:26:53 +08:00
halx99 51e3208e59 The command 'cocos new' python script now works both 2.x and 3.x 2020-10-20 12:51:04 +08:00
halx99 3741bbd7e2 Finish cpp and lua template to use env var 'COCOS2DX_ROOT' to avoid copy whole engine source when new project. 2020-10-19 18:33:10 +08:00
halx99 b3a9a9fa04 Sync build script 2020-10-08 23:25:32 +08:00
halx99 5afa150982 Sync official v4 tools 2020-10-08 22:32:07 +08:00
halx99 1f8431b7c8 Use pyenv manage python version for travis-ci (#229) 2020-10-07 22:45:05 +08:00
halx99 c3822d169b Android travis ci [skip appveyor] (#228) 
Set python to 2.7.12
 2020-10-07 12:35:08 +08:00
halx99 eda4e3e1a2 build mac with alsoft 2020-10-06 16:50:06 +08:00
halx99 cca0739793 Refactor pixel format manipulate (#217) 
* PixelFormat use table

* Correct PixelFormat name to match 'GL_LUMINANCE'

* Up

* fix cube update texture enum

* linux build

* Refine ci

* fix linux build

* Remove unused function, match mtl framebuffer pixel format

* readPixels always RGBA format

* fix ci for linux

* fix linux build

* Remove unused functions

* fix travis

* fix android ci

* Update config.json

* linux glad

* Update CCGLViewImpl-desktop.cpp

* fix linux build

* Fix linux build

* Link issue [skip appveyor][skip travis]

* Update CMakeLists.txt

* Refine GL enums use

* Update test case name [skip appveyor][skip travis]

* fix linux link issue

* for mtl

* fix ci

* Tidy pixelformat enums

* fix ci

* fix rgba8 to abgr4 error

* fix ci

* fix ci for GLES

* Fix linux build, require glibc-2.27+

* Use properly dist for travis [skip appveyor]

* fix linux build [skip appveyor]

* Update install-deps-linux.sh

* Remove unused members for pixel block info, update external to v73

* Sync from compile linux warnings

* Remove unused check, and PixelFormat::A8 is ordinary format, not compressed format

* metal doesn't support rgb8 (#3)

* Update CCTexture2D.cpp

* Refine code

* Pixel Format Descriptor Table

* fix ci

* BGR5A1

* Simplfy texture format convert function name

* Update

* rgba4 match mtl render format

* Add note about RGBA4

* Remove unused function

* fix osx

* Already converted at texture2d

* Clearly comment

* fixup
 2020-09-25 11:07:56 +08:00
halx99 6e7e117a0d RenderTarget abstract, in-progress (#210) 
RenderTarget abstract
 2020-09-21 22:10:50 +08:00
halx99 d8f6edd211 fix .travis.yml 2020-09-04 17:19:51 +08:00
halx99 170d8eb0f5 test 2020-09-04 17:03:25 +08:00
halx99 715858a0e0 Enable mac build for ci 2020-09-04 16:47:32 +08:00
halx99 86c70e429b Improve ios CMake scripts 2020-08-24 01:26:12 -07:00
halx99 10d51d0c22 Update CMake scripts 2020-08-17 19:18:18 +08:00
halx99 ee6c56ddfc Set CC_USE_ALSOFT_ON_APPLE=ON at travis build script 2020-07-31 15:11:13 +08:00
halx99 7da8030414 Add console scripts & bindings-generator 2020-07-20 18:46:15 +08:00
halx99 b39d318a0f fix ci error 2020-05-18 09:16:10 +08:00
weiwest a998fe8c14 Merge: 2a02db76d8 2d3e162e21 
Merge remote-tracking branch 'upstream/master'
 2020-02-12 16:58:47 +08:00
weiwest 33b9e8330b add astc soft decode support 2020-02-11 23:54:17 +08:00
halx99 61b9e21b51 Merge: e698c3ed81 3fb83491c5 
Merge pull request #48 from c4games/fix-ios-link-error

fix ios openssl link error
 2020-02-11 13:32:42 +08:00
halx99 579eeb5e7b Merge: 33d3721c6a 33e765455c 
Merge pull request #47 from c4games/ios-build-guides

Update README.md
 2020-02-08 22:33:14 +08:00
halx99 9b3dfe29a7 fix ios openssl link error 2020-02-08 22:10:08 +08:00
halx99 10e3965bf8 fix cmake gen command for vs2019 2020-02-08 15:41:13 +08:00
halx99 eec29eb3be Reset ios toolchain 2020-02-07 20:59:22 +08:00
halx99 fcbc5afbb3 Merge: b39b6e9acb cffc332499 
Merge pull request #44 from halx99/master

Fix travis ci ios build issue
 2020-02-07 19:56:34 +08:00
halx99 b2f30327d7 Update ios cmake guide 2020-02-07 19:28:41 +08:00
halx99 3c71559b17 Use ios.toolchain.cmake 2020-02-07 19:26:45 +08:00
halx99 209fbae7bf Add ios.toolchain.cmake 2020-02-07 18:59:44 +08:00
halx99 25ec31f938 test iphoneos 2020-02-07 16:14:27 +08:00
Arnold ecd81c77dc [CI ]add cocos new for iOS (#20380) 2019-11-30 16:58:49 +08:00
halx99 0538506b05 update audio, deps-9, ci for windows 2019-11-30 16:20:25 +08:00
halx99 7723c0e5f1 Update run-script.sh 2019-11-30 07:08:58 +08:00
halx99 7af7b6494c Update config.json 2019-11-30 06:19:15 +08:00
halx99 45dbdc8c7d fix indent 2019-11-30 06:17:33 +08:00
halx99 f66674ab9c Update run-script.sh 2019-11-30 06:15:54 +08:00
halx99 d5af773970 Merge: f8e6c06286 cea283c489 
Merge pull request #11 from simdsoft/sync-v4

Sync v4
 2019-11-26 08:49:56 -08:00
halx99 217962e748 Merge: 3cab821c25 8ff2ea18c2 
Merge pull request #10 from simdsoft/v5-deps-5

update deps to v5-deps-5
 2019-11-26 08:28:03 -08:00
Arnold 69b9b1fe4d fix appvenyor env (#20372) 2019-11-26 23:40:57 +08:00
halx99 00ededdbb4 skip gen luabindings for ci 2019-11-25 20:32:43 +08:00
halx99 ba2b8b3b6d Merge: 6078a4c922 aad1a18a8f 
Merge branch 'master' of https://github.com/simdsoft/engine-v5
 2019-11-25 20:26:43 +08:00
halx99 c77560fb80 Make writeValueMapToFile works well with pugixml. 2019-11-25 20:26:29 +08:00
halx99 cf15088dd5 Temporary disable auto luabindings push 2019-11-25 19:48:31 +08:00
halx99 8df3d5e274 Init Commit 2019-11-23 20:27:39 +08:00