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

553 Commits

Author SHA1 Message Date
halx99 5484825229 Fix indent with clang-format [ci build] 2021-04-24 16:58:41 +08:00
rh101 155fe98406 openFileStream now returns a nullptr if it fails 2021-04-24 09:22:27 +10:00
rh101 e1ce966be2 Remove redundant std::move 2021-04-23 22:00:33 +10:00
rh101 6502627714 Added getNativeWritableAbsolutePath() which will always return the underlying file system raw path. 
Re-enabled memory mapped UserDefault usage, since it now has access to the raw file system path.
 2021-04-23 01:00:00 +10: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 dd5f77c3d5 Merge: 15c8f2298d 0886473e1b 
Merge pull request #4 from rh101/master

Sync with master
 2021-04-22 21:49:43 +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 6effb1642f Fix #339 [ci build] 2021-04-22 18:55:56 +08:00
halx99 8ed6d34234 Explicit set cmake minimum version at app/build.gradle [ci build] 2021-04-22 11:40:53 +08:00
rh101 57e2d5dea8 Fixed typo 2021-04-22 03:18:23 +10:00
rh101 2bf12b2226 Add support for virtual file system via custom FileStream and FileUtils implementations. 2021-04-22 03:15:49 +10:00
halx99 473e51cee7 Set cmake min version to 3.10 [ci build] 2021-04-21 14:05:44 +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 fce0f9caf0 Refine director access [ci build] 2021-02-05 23:09:14 +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 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 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
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 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 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
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
halx99 bcb96e66ee Merge: 289bc4fccc ee996a5cfb 
Merge pull request #282 from rh101/fix-editbox-globalz

Ensure global Z is correctly set on all child items of EditBox
 2020-11-26 23:00:14 -08:00
rh101 220ef7a6bf Allow user to set custom program type value 2020-11-27 17:26:02 +11:00
rh101 11e78b27c0 Add support for center vertical layout 2020-11-27 17:24:07 +11:00
rh101 25bf822fb8 Fix ListView dimensions when child elements are scaled. 2020-11-27 17:02:31 +11:00
rh101 35e57843c8 Ensure global Z is correctly set on all child items of EditBox 2020-11-27 16:59:34 +11:00
halx99 cf24cf3a36 Sync yasio to 3.33.4 [ci build] 2020-11-25 19:07:21 +08:00
halx99 1353c00758 Sync pr: https://github.com/cocos2d/cocos2d-x/pull/20614 2020-11-24 18:10:28 +08:00
halx99 3f0d17b520 Merge: a10d7701b8 a606572775 
Merge pull request #277 from aismann/master

Update cocos.bat
 2020-11-23 01:27:53 -08:00
Eismann 381189f726 Update cocos.bat 2020-11-23 09:55:07 +01:00