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

13630 Commits

Author SHA1 Message Date
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 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 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 b76cd80043 Sync for glad 2020-02-16 16:44:14 +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 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 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 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 f36d21c9bf fix #51 2020-02-12 20:15:09 +08:00
weiwest 89105d0db2 Merge remote-tracking branch 'upstream/master' 2020-02-12 16:58:47 +08:00
weiwest 2a02db76d8 remove test log 2020-02-12 15:52:08 +08:00
weiwest 9496d34470 add astc soft decode support 2020-02-11 23:54:17 +08:00
halx99 38564c696d fix ci error for PLATFORM_TARGET_MAC 2020-02-07 16:51:57 +08:00
halx99 f9b8460aeb Sync lua bindings for UserDefault Refactor 2020-02-07 16:45:25 +08:00
halx99 70cb64854f fix comment. 2020-02-06 23:33:12 +08:00
halx99 9599c936cd Refactor UserDefault, cbc128 encrypt support. 2020-02-06 23:30:33 +08:00
weiwest dbc089d51d add astc support 8x8 block size 2020-02-06 21:54:45 +08:00
halx99 e10155bef4 Refactor UserDefault, add plain mode for win32. 
plain mode: 760ms
binary mode: 11ms
 2020-02-06 21:15:15 +08:00
halx99 21b378ead3 Refactor UserDefault, handle error & fix can't enlarge problem. 2020-02-06 11:55:28 +08:00
halx99 e312fd356e Refactor UserDefault, optmize for huge entities. 2020-02-06 01:08:51 +08:00
weiwest a6edda385b add astc support 2d 4x4 RGBA 2020-02-05 22:45:19 +08:00
halx99 b6cf5871cd Refactor UserDefault, use file mapping & plain binary encode/decode for all platform 2020-02-04 22:28:54 +08:00
coulsonwang 2b4b7c4aae fix drawnode line width issue (#20442) 2020-01-18 20:40:34 +08:00
coulsonwang ea7d96835f fix memory leak issue (#20440) 2020-01-18 20:40:30 +08:00
CocosRobot ab06e75103 [ci skip][AUTO]: updating luabinding & cocos_file.json automatically (#20438) 2020-01-18 20:40:25 +08:00