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

38587 Commits

Author SHA1 Message Date
rh101 8de1099614 Add support for virtual file system via custom FileStream and FileUtils implementations. 2021-04-22 03:15:49 +10:00
RH 2cef9f2e76
Merge pull request #1 from c4games/master 
Sync with engine-x
 2021-04-21 20:13:38 +10:00
halx99 e8c1d7bc2c Set cmake min version to 3.10 [ci build] 2021-04-21 14:05:44 +08:00
halx99 8eac361f40 Use cmdline-tools instead sdk-tools [ci build] 2021-04-20 22:35:29 +08:00
halx99 e3005cb1bd Use cmdline-tools instead sdk-tools [ci build] 2021-04-20 22:30:39 +08:00
HALX99 6d57ecccc2
Use cmdline-tools instead sdk-tools [ci build] 2021-04-20 21:39:42 +08:00
halx99 3a7594d965 Use cmdline-tools instead sdk-tools [ci build] 2021-04-20 21:02:55 +08:00
halx99 82fefa78d3 Use cmdline-tools instead sdk-tools [ci build] 2021-04-20 20:58:09 +08:00
halx99 d8a1298245 Use cmdline-tools instead sdk-tools [ci build] 2021-04-20 20:46:32 +08:00
halx99 cb7f26dbe1 Use cmdline-tools instead sdk-tools [ci build] 2021-04-20 20:44:12 +08:00
halx99 4a1405e79f Ensure build native first before compile java code 
3ff5b16
 2021-04-20 20:27:38 +08:00
halx99 3ff5b16847 Ensure build native first before compile java code 2021-04-20 20:25:32 +08:00
halx99 612710b1b6 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 273cd3c7c3
Update before-install.sh [ci build] 2021-04-08 23:32:34 +08:00
HALX99 b0d56dbc7c
Update before-install.sh [ci build] 2021-04-08 23:28:46 +08:00
HALX99 ab904cdcb1
Update before-install.sh [ci build] 2021-04-08 23:08:05 +08:00
halx99 d33ffa67cd Set gradle-wrapper to 6.8.3 [ci build] 2021-04-08 22:42:15 +08:00
HALX99 24f127e3ca
Update README.md 2021-04-02 10:22:10 +08:00
halx99 e1352dbede Track bt to 3.09 #333 2021-03-27 20:08:55 +08:00
halx99 958f6c3a93 Properly set gc mode for lua-5.4 [ci build] 2021-03-27 19:49:19 +08:00
halx99 9972ddd71c fix lua-tests cmake script 2021-03-26 17:10:37 +08:00
halx99 adf3483943 Fix CMakeLists for separating test projects [ci build] 2021-03-15 09:50:32 +08:00
HALX99 1590c200d5
Merge pull request #331 from c4games/cmake-improve 
Improve cmake scripts
 2021-03-13 18:46:32 +08:00
HALX99 6a868299f5
Merge pull request #330 from c4games/lua54-compat 
Lua 5.4 compatible
 2021-03-13 18:46:13 +08:00
halx99 9aebfd4b0d Improve cmake scripts 
a. rename project 'plainluac' to 'luac'
b. add executable project 'lua'
c. unify cmake runtime directory to bin
 2021-03-13 18:18:40 +08:00
halx99 a5cf017e0f Lua 5.4 compatible 2021-03-13 16:47:09 +08:00
halx99 91bfb7c8ff Update win32 prebuilt libs 
1. build with msvc toolset 14.28.29910.0
2. curl-7.75, openssl-1.1.1j
3. angle branch chromium/4439
4. openal-1.21.1 (7533)
 2021-03-08 00:06:11 +08:00
halx99 87d00a32de Fix #326 [ci build] 2021-02-24 18:50:13 +08:00
halx99 41f5307d36 Refine director access [ci build] 2021-02-05 23:09:14 +08:00
halx99 3f1f872ba0 Disable luajit compile for release build 2021-02-05 21:59:50 +08:00
HALX99 bd79c4f893
Update LICENSE 2021-02-03 15:37:48 +08:00
HALX99 138781151a
Fix depth stencil state/desc (#321) 
* Fix ds state

* fix 3d object not render

* Update DepthStencilStateGL.cpp

* fix ds, not complete

* fix image ref incorrect

* Fix metal captureScreen

* Share ds desc
needs restore properly after non-default render target destroy.

* fix gl compile

* Sync ds desc

* Only set vertex & index buffer once for batch draw

* Add set/get ds desc for renderer

* Refine code style

* Fix RenderTextureTest
a. should restore stencil desc properly

* Sync gl captureNode

* Sync GL
 2021-01-31 22:22:52 +08:00
halx99 04b87dfe5d Fix #318 2021-01-27 12:03:42 +08:00
halx99 169c13ad6f Fix warnings 2021-01-26 19:00:04 +08:00
HALX99 dc99785b38
Merge pull request #316 from c4games/revert-314-fix-313 
Revert "Fix #313"
 2021-01-21 13:07:17 +08:00
HALX99 46fad08e4c
Revert "Fix #313" 2021-01-21 12:41:01 +08:00
halx99 ab8cde3e95 Fix ParticleBatchNode texture not bind [ci build] 2021-01-19 23:53:22 +08:00
halx99 610ec87b15 Update curl-7.74.0, openssl-1.1.1i for win32 [ci build] 2021-01-19 17:13:18 +08:00
halx99 6ad117ee9c Sync yasio 2021-01-19 15:00:08 +08:00
halx99 68e56f2cc2 Sync yasio-3.37.0 final [ci build] 2021-01-18 15:39:47 +08:00
HALX99 cb5f2547fa
Merge pull request #314 from c4games/fix-313 
Fix #313
 2021-01-16 17:29:46 +08:00
halx99 ae0c3eddef Fix #313 
a. error: depthAttachment PixelFormat (MTLPixelFormatInvalid) and stencilAttachment PixelFormat (MTLPixelFormat Depth32Float_Stencil8) must match.
b. Because we only support D24S8(D32FS8) combined format, so needs check
TargetBuffferFlags::DEPTH_AND_STENCIL when setup depth and stencil
format, otherwise newRenderPipelineWithDescriptor will crash.
 2021-01-16 00:01:21 +08:00
halx99 66bed7c037 Update yasio to 3.37.0 2021-01-14 15:30:18 +08:00
halx99 f771a92ca2 lua api compatible 2021-01-09 18:32:22 +08:00
HALX99 abc87f8cd5
Update README.md 2020-12-29 21:48:02 +08:00
HALX99 959c3fb19f
Update README.md 2020-12-29 20:55:12 +08:00
halx99 e6dacefdc0 Update c-ares version 2020-12-24 16:22:29 +08:00
halx99 b9cc48d9f1 Sync bullet to 3.08 [ci build] 2020-12-24 16:17:15 +08:00
halx99 ddb03ca44e Sync yasio 2020-12-23 19:23:48 +08:00
HALX99 9c855006a3
Merge pull request #311 from aismann/master 
Update controller.cpp
 2020-12-21 22:19:29 +08:00