Commit Graph

2323 Commits

Author SHA1 Message Date
halx99 e05c59f7e1 Update before-install.sh [ci build] 2021-04-08 23:08:05 +08:00
halx99 1c2daaf4ae Set gradle-wrapper to 6.8.3 [ci build] 2021-04-08 22:42:15 +08:00
halx99 19ef72f788 Properly set gc mode for lua-5.4 [ci build] 2021-03-27 19:49:19 +08:00
halx99 2a10e85122 fix lua-tests cmake script 2021-03-26 17:10:37 +08:00
halx99 5488a8da20 Fix CMakeLists for separating test projects [ci build] 2021-03-15 09:50:32 +08:00
halx99 4f0f713977 Merge: 6a868299f5 9aebfd4b0d
Merge pull request #331 from c4games/cmake-improve

Improve cmake scripts
2021-03-13 18:46:32 +08:00
halx99 b8892e446b Merge: 91bfb7c8ff a5cf017e0f
Merge pull request #330 from c4games/lua54-compat

Lua 5.4 compatible
2021-03-13 18:46:13 +08:00
halx99 d7610b8c77 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 261bea4234 Lua 5.4 compatible 2021-03-13 16:47:09 +08:00
halx99 fce0f9caf0 Refine director access [ci build] 2021-02-05 23:09:14 +08:00
halx99 327b4717fb Disable luajit compile for release build 2021-02-05 21:59:50 +08:00
halx99 9802f30aad Update LICENSE 2021-02-03 15:37:48 +08:00
halx99 6904b9f3f3 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 472266c25c Fix #318 2021-01-27 12:03:42 +08:00
halx99 53bbf7368c Fix warnings 2021-01-26 19:00:04 +08:00
halx99 03e130a19f Revert "Fix #313" 2021-01-21 12:41:01 +08:00
halx99 be79c908c5 Fix ParticleBatchNode texture not bind [ci build] 2021-01-19 23:53:22 +08:00
halx99 734602069e 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 757e7edbf7 lua api compatible 2021-01-09 18:32:22 +08:00
halx99 11ca0866e1 Update README.md 2020-12-29 21:48:02 +08:00
halx99 38e4053251 Update README.md 2020-12-29 20:55:12 +08:00
halx99 9cb8963ca3 Merge: aded15aac7 057642921b
Merge pull request #311 from aismann/master

Update controller.cpp
2020-12-21 22:19:29 +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 3ebb1f57c0 Fix next drawable maybe nil crash[ci build] (#310) 2020-12-17 15:31:16 +08: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 86e0340b9d Sync yasio [ci build] 2020-12-15 18:58:04 +08:00
halx99 3a49f0e064 Merge: c3ad19df96 c95e0466e1
Merge pull request #308 from c4games/refactor-android-run-on-gl-thread

Refactor android runOnGLThread
2020-12-10 16:56:14 +08:00
halx99 78aaf568c6 fix FUISprite gray to normal doesn't work 2020-12-10 16:54:59 +08:00
halx99 ca4597a1ff 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
aismann 0fab6141b6 same/correct wording style 2020-12-03 21:33:52 +01:00
halx99 eb2fcc36b9 fix link error on macOS Big Sur 11.01
Follow lib removed by Apple
1. /usr/lib/libz.dylib
2. /usr/lib/libiconv.dylib
2020-12-02 21:59:57 -08:00
halx99 5fe25cb0aa fix README.md markdown syntax 2020-12-02 20:49:08 -08:00
halx99 32891603ee fix libjpeg-turbo can't build with combined archs
such as (armv7,arm64)
2020-12-02 20:45:06 -08:00
halx99 04db04ad93 Merge: 3f4178cc27 dbf81d7511
Merge pull request #295 from aismann/master

CCPhysicsSprite(Box2D/Chipmunk2D) cleanup, some other small improvements...
2020-12-02 08:39:58 -08:00
halx99 571adc605a fix ci 2020-12-02 03:33:53 -08:00
halx99 8b9d5db029 Unify CC_COMPAT_GL to control renderer backend
win32: google angle
mac: NSGL
ios: GLES
2020-12-02 03:03:05 -08:00
aismann fd70034958 Removed CC_ENABLE_CHIPMUNK_INTEGRATION from class CCPhysicsDebugNode
CCPhysicsDebugNode.cpp has only the Chipmunk2D implementation
2020-12-01 17:58:34 +01:00
aismann 73b2b175d9 CCPhysicsSprite(Box2D/Chipmunk2D) cleanup, some other small improvements too
CCPhysicsSprite(Box2D/Chipmunk2D) cleanup and small improvements on PhysicsTest
2020-12-01 16:39:28 +01:00
halx99 c7c58ae3cc Merge: 2c93318d37 58ddd6e085
Merge pull request #294 from aismann/patch-1

Update README.md
2020-12-01 02:12:41 -08:00
halx99 43f5a305c8 Merge: 079ecdbbec 5e249bf6f8
Merge pull request #293 from aismann/master

Chipmunk2D and Box2D works together now (add two new classes) and FIX  ImGuiEXTTest window size problem
2020-12-01 01:52:47 -08:00
aismann 18cc4a9eb4 Update README.md
change wiki link:  https://github.com/c4games/engine-x-wiki
2020-12-01 10:32:09 +01:00
aismann 91843b3fae Chipmunk2D and Box2D works together now (add two new classes)
add class PhysicsSpriteChipmunk2D
add class PhysicsSpriteBox2D

Improve window size problem with ImGuiEXTTest
2020-12-01 10:15:30 +01:00
Acc 73f5334a3e Update README_CN.md 2020-12-01 12:17:09 +08:00
halx99 c70ccf6b36 Update issue_template.md 2020-11-29 12:39:18 +08:00
halx99 315e42b126 Merge: 4c1ff6bd01 369bef3614
Merge pull request #286 from rh101/add-center-vertical-layout-support

Add support for center vertical layout
2020-11-26 23:43:25 -08:00
halx99 cc7366845e Merge: 74add84559 f113e1f2ed
Merge pull request #285 from rh101/fix-listview-dimensions

Fix ListView dimensions when child elements are scaled
2020-11-26 23:08:30 -08:00