Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
38,330 Commits 2 Branches 34 Tags 1.2 GiB
Commit Graph

38330 Commits

Author SHA1 Message Date
halx99 bc4eab96d5 fix #86 2020-05-06 16:28:34 +08:00
halx99 ad93fad2c3 Merge 2020-05-06 15:43:55 +08:00
halx99 40cb068201 finish issue: #85 2020-05-06 15:42:25 +08:00
HALX99 2385f6847d
Update config.json 2020-05-04 16:33:09 +08:00
HALX99 d8bc945f1f
Update deps to v34 2020-04-22 16:46:53 +08:00
HALX99 ff6c2e54a5
Update README.md 2020-04-20 12:10:21 +08:00
HALX99 5b30bf9114
Merge pull request #84 from c4games/halx99-patch-1 
fix memory leak & correct indent
 2020-03-30 19:37:42 +08:00
HALX99 61b14bf86c
fix memory leak & correct indent 2020-03-30 14:54:13 +08:00
HALX99 5fd1bc7da7
Merge pull request #82 from halx99/master 
Remove unused src
 2020-03-05 23:39:40 +08:00
HALX99 39f3dd6586
Remove unused src 2020-03-05 20:47:11 +08:00
HALX99 3c5c1510c8
Merge pull request #81 from halx99/master 
Remove unused Android.mk files
 2020-03-05 14:44:55 +08:00
halx99 b24d244f6e Remove unused Android.mk files 2020-03-04 22:59:33 +08:00
HALX99 8eb49008a2
Merge pull request #80 from halx99/master 
Update deps to v33
 2020-03-04 10:44:57 +08:00
halx99 e942945127 Merge branch 'master' of https://github.com/halx99/engine-x 2020-03-03 23:18:14 +08:00
halx99 313d4dc2a1 Update deps to v33 2020-03-03 23:17:38 +08:00
HALX99 8ea95eebd6
Merge pull request #79 from halx99/master 
Refactor CCValue.
 2020-03-03 22:55:40 +08:00
HALX99 04ac727c8e
fix ios compile error 2020-03-03 20:05:56 +08:00
halx99 e379fc513d Refactor CCValue. 2020-03-03 19:24:07 +08:00
HALX99 b92de91b58
Merge pull request #76 from halx99/master 
Use original c lib minizip-1.2.0
 2020-02-28 15:04:27 +08:00
halx99 4414e64dd6 Use original c lib minizip-1.2.0 2020-02-28 13:55:25 +08:00
HALX99 db10fb73d3
Merge pull request #75 from halx99/master 
Remove unnecessary std::move semantics
 2020-02-28 13:23:15 +08:00
halx99 f91ed91688 Remove unnecessary std::move semantics 2020-02-28 12:10:27 +08:00
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