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

28 Commits

Author SHA1 Message Date
halx99 554412f4fd Use struct `Vec2` instead `Size` 2021-10-23 23:27:14 +08:00
姒嗘煶鏉? 35b658c90e Merge: f5663f279c d73d937894 
Merge remote-tracking branch 'upstream/dev' into dev
 2021-09-05 20:45:32 +08:00
姒嗘煶鏉? 0aff165959 [fix]ScrollView and ListView goes back to the front incorrectly after calling doLayout. 2021-09-05 20:44:14 +08:00
halx99 764c17e86e LayerMultiplex use Node* to store layers 
a. Layer no specificed functions
 2021-09-03 11:13:15 +08:00
halx99 1f15fbe192 Remove deprecated stubs 2021-09-02 11:16:36 +08:00
halx99 3e4d8dd3ac Revert unexpected layer changes 2021-09-01 11:11:32 +08:00
halx99 0a4d3ee73d Merge: cb81a61530 a762c94904 
Merge branch 'dev' of https://github.com/adxeproject/adxe into dev
 2021-09-01 10:10:46 +08:00
halx99 756ff065c8 Enum compatible [skip ci] 2021-08-31 15:50:18 +08:00
halx99 be5eff1d5a Refactor layer 
Reimplement LayerColor and LayerGradient based on sprite for auto batch draw
 2021-08-30 19:47:53 +08:00
halx99 5cc2b14697 Merge: 858d46ae65 8e1d7bd85d 
Merge commit 'refs/pull/483/head' of https://github.com/adxeproject/adxe into dev
 2021-08-30 19:32:05 +08:00
halx99 48a1164168 Update bug_report.md 2021-08-30 10:47:07 +08:00
halx99 eef61007bf Reimplement LayerColor and LayerGradient for auto batch draw 2021-08-29 18:59:09 +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 fce0f9caf0 Refine director access [ci build] 2021-02-05 23:09:14 +08:00
halx99 8a8d96e8d4 Refine DrawNode, should not use Node::_programState for private use (#251) 
The follow classes should not reuse Node::_programState, otherwise needs override Node::setProgramState to update programState of pipelineDescriptor:
- DrawNode
- LayerColor
- LayerRadialGradient
- ParticleBatchNode
- ParticleSystemQuad
 2020-10-26 14:49:14 +08:00
halx99 c594e3789c Refactor programState management (#236) 
1. Add custom program registery
2. Re-enable batch draw for custom program
 2020-10-16 16:23:14 +08:00
halx99 1d53eaf3ff Take care _programState use 2020-07-21 23:11:03 +08:00
halx99 9d797b6998 Clean JSB sources, optmize script event dispatch. 2020-02-28 02:15:33 +08:00
halx99 bb441097e7 Merge: f6853a5852 f36d21c9bf 
Merge pull request #52 from c4games/fix-issue51

fix #51
 2020-02-12 20:58:25 +08:00
halx99 41f0869926 Merge: 2d3e162e21 5d7f58c3ad 
Merge pull request #50 from weiwest/master

add astc support (Great Job)
 2020-02-12 20:24:29 +08:00
halx99 53d784af8d fix #51 2020-02-12 20:15:09 +08:00
halx99 3bb4edfbf9 Merge: 179ec6ed67 e9305431da 
Merge pull request #13 from cocos2d/v4

sync V4
 2019-11-23 20:20:02 -08:00
halx99 8df3d5e274 Init Commit 2019-11-23 20:27:39 +08:00