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

38808 Commits

Author SHA1 Message Date
halx99 a558bc2198 Optimize & sync sources 2020-02-28 02:15:33 +08:00
halx99 ddb30e881c Clean JSB sources, optmize script event dispatch. 2020-02-28 02:15:33 +08:00
HALX99 23b3deaa23
Merge pull request #72 from c4games/sync-v3-pr20107 
Sync v3 pr20107 & fix builtin shaders
 2020-02-24 20:59:11 +08:00
HALX99 b350a7abf8
Merge pull request #71 from c4games/sync-v3-pull-19256 
Sync v3 pr-19256
 2020-02-24 19:52:22 +08:00
HALX99 0c291dd470
Merge pull request #70 from c4games/remove-unused-shader 
Remove unused shader
 2020-02-24 17:51:58 +08:00
halx99 d9e6cb8e33 Sync v3 pr20107 & fix builtin shaders, see: https://github.com/cocos2d/cocos2d-x/pull/20107 2020-02-24 17:09:25 +08:00
halx99 f0d60d4a85 Fixup, optimize shader compile log. 2020-02-24 16:27:10 +08:00
halx99 f5eac1eede Sync v3 pr-19256, see: https://github.com/cocos2d/cocos2d-x/pull/19256 2020-02-24 16:22:40 +08:00
halx99 a7e118ec0b Remove unused shader 2020-02-24 16:13:49 +08:00
HALX99 8e5271e42a
Merge pull request #69 from c4games/fix-issue-41 
fix #41
 2020-02-24 15:19:36 +08:00
halx99 06688a8576 Update readme 2020-02-23 23:00:14 +08:00
halx99 acd5c36e10 Update ci status 2020-02-23 22:31:31 +08:00
HALX99 675dc19354
fix url 2020-02-23 21:58:53 +08:00
halx99 ab84b8be19 Add missing header 2020-02-23 21:36:36 +08:00
halx99 2086cf04d3 fix indent 2020-02-23 21:31:55 +08:00
halx99 3e0ca066ba fix #41 2020-02-23 21:27:14 +08:00
HALX99 8678693829
Merge pull request #66 from c4games/remove-dup 
Remove duplicated code
 2020-02-17 23:00:53 +08:00
HALX99 169fd54f62
Remove duplicated code 2020-02-17 20:21:43 +08:00
HALX99 a5de6b810b
Fix adjust issue at Texture2DGL::initWithZeros 2020-02-17 00:13:56 +08:00
HALX99 952cf12492
Merge pull request #63 from c4games/sync-glad 
Sync glad
 2020-02-16 18:46:46 +08:00
halx99 3d19698c6c Update deps to v31 2020-02-16 17:07:13 +08:00
halx99 b76cd80043 Sync for glad 2020-02-16 16:44:14 +08:00
HALX99 d3c465599e
Merge pull request #62 from c4games/gl-loader-glad 
Use modern gl/gles loader 'glad' to instead 'glew'
 2020-02-16 13:00:41 +08:00
halx99 1f9f27d63f Use modern gl/gles loader 'glad' to instead 'glew' 2020-02-15 23:51:23 +08:00
HALX99 1d551a1897
Merge pull request #60 from c4games/remove-xxtea 
Remove xxtea, cleanup xxtea reference sources
 2020-02-15 23:48:21 +08:00
halx99 d3162956e7 Sync https://github.com/cocos2d/cocos2d-x/pull/20457 2020-02-15 21:38:37 +08:00
halx99 429fd4f27e Update features status 2020-02-15 21:20:22 +08:00
halx99 5416b4d34c Remove xxtea, cleanup xxtea reference sources 2020-02-15 20:54:33 +08:00
HALX99 b8986f339b
Merge pull request #58 from c4games/mmt-ios 
Make multi-meta-textures feature works on Apple Metal.
 2020-02-15 20:51:20 +08:00
halx99 e2c4b786b8 Call initWithZeros at constructor once is works 2020-02-15 17:35:44 +08:00
halx99 effc75bd78 Refine sources 2020-02-15 10:48:44 +08:00
halx99 8aee15f7c0 fix ci error 2020-02-15 03:10:01 +08:00
halx99 78f9dfa8ef Remove unnecessary constructors. 2020-02-15 02:58:41 +08:00
halx99 3bea76ee4d Refine STMGT 2020-02-15 02:36:02 +08:00
halx99 4c9e87ac51 Move maxTextureIdx to base texture class 2020-02-14 23:42:05 +08:00
HALX99 f7330a9b3c
Merge pull request #56 from c4games/astc-ios 
Make astc works on ios platform.
 2020-02-14 23:23:07 +08:00
halx99 54fecde8a2 Make multi-meta-textures support works on Metal. 2020-02-14 21:40:33 +08:00
HALX99 5a83d24b2f
Merge pull request #57 from c4games/deps-29 
Update deps to v29
 2020-02-14 21:25:46 +08:00
halx99 2bf350beb0 Update deps to v29 2020-02-14 19:14:39 +08:00
halx99 a460438c3b Make astc works on ios platform. 2020-02-14 19:10:01 +08:00
HALX99 363dab75c9
Merge pull request #55 from c4games/fix-issue53 
fix #53
 2020-02-14 18:12:31 +08:00
halx99 5778ac9da1 Refine extensions output. 2020-02-14 16:03:58 +08:00
halx99 70561f2c0e fix compile error 2020-02-14 15:44:46 +08:00
halx99 2fe58e86ae fix #53 2020-02-14 15:18:56 +08:00
HALX99 deb7c48844
Merge pull request #52 from c4games/fix-issue51 
fix #51
 2020-02-12 20:58:25 +08:00
HALX99 f6853a5852
Merge pull request #50 from weiwest/master 
add astc support (Great Job)
 2020-02-12 20:24:29 +08:00
halx99 f36d21c9bf fix #51 2020-02-12 20:15:09 +08:00
weiwest 5d7f58c3ad update deps to v28 2020-02-12 19:30:09 +08:00
weiwest 27343411de update deps to v27 2020-02-12 17:04:03 +08:00
weiwest 89105d0db2 Merge remote-tracking branch 'upstream/master' 2020-02-12 16:58:47 +08:00