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

38566 Commits

Author SHA1 Message Date
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
halx99 aded15aac7 Sync yasio to 3.35.0 [ci build] 2020-12-21 18:12:13 +08:00
aismann 057642921b 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 208d07697f Fix next drawable maybe nil crash[ci build] (#310) 2020-12-17 15:31:16 +08:00
halx99 c44d94a2b2 Update lua bindings source [ci build] 
cxx17::string_view support
 2020-12-16 17:52:17 +08:00
halx99 2b7ca1b858 Merge branch 'master' of https://github.com/c4games/engine-x 2020-12-16 12:47:04 +08:00
halx99 d467b647e2 Sync luabinding config file 2020-12-16 12:46:37 +08:00
HALX99 29819491f7
Update README.md 2020-12-16 12:33:22 +08:00
halx99 03b605dcee Sync yasio [ci build] 2020-12-15 18:58:04 +08:00
HALX99 f91d9bb91e
Merge pull request #308 from c4games/refactor-android-run-on-gl-thread 
Refactor android runOnGLThread
 2020-12-10 16:56:14 +08:00
halx99 c3ad19df96 fix FUISprite gray to normal doesn't work 2020-12-10 16:54:59 +08:00
halx99 c95e0466e1 Refactor android runOnGLThread 
Ensure the callback run engine core mainLoop,
This commit can solve any weird behaviors, such as:
a. text render maybe missing charactors when bring from back to frontend
b. some renderer objects alpha may present black at sdk callback call
c. some other things
All above behavior is caused gl state not ready when go back to game activity from sdk activity
 2020-12-09 15:13:57 +08:00
halx99 e906b27039 Sync yasio to 3.34.1 2020-12-08 20:36:55 +08:00
halx99 1cf59a76fb Sync yasio 2020-12-08 19:10:58 +08:00
halx99 e273d77c96 Update bullet to 3.07 [ci build] 2020-12-08 14:22:07 +08:00
HALX99 a309ea3e98
Update README.md 2020-12-07 14:00:19 +08:00
HALX99 cee94a0580
Merge pull request #304 from c4games/halx99-patch-1 
LUAI_USER_ALIGNMENT_T matching clang defination
 2020-12-06 00:47:21 +08:00
HALX99 5992d10b57
LUAI_USER_ALIGNMENT_T matching clang defination 2020-12-05 23:02:59 +08:00
HALX99 48dd621d00
Merge pull request #303 from c4games/halx99-patch-1 
Update CMakeLists.txt
 2020-12-05 00:33:54 +08:00
HALX99 118504d3ff
Update CMakeLists.txt 2020-12-04 22:31:46 +08:00
halx99 c6c3eedb99 Sync yasio [ci build] 2020-12-04 18:24:55 +08:00
HALX99 15da26ea92
Merge pull request #300 from aismann/master 
same/correct wording style
 2020-12-04 09:30:36 +08:00