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

3001 Commits

Author SHA1 Message Date
halx99 82808a321d Remove duplicated code 2020-02-17 20:21:43 +08:00
halx99 584ee96a89 Fix adjust issue at Texture2DGL::initWithZeros 2020-02-17 00:13:56 +08:00
halx99 ab322c8641 Sync for glad 2020-02-16 16:44:14 +08:00
halx99 d0a5839439 Use modern gl/gles loader 'glad' to instead 'glew' 2020-02-15 23:51:23 +08:00
halx99 0cb266cb57 Merge: d3162956e7 5416b4d34c 
Merge pull request #60 from c4games/remove-xxtea

Remove xxtea, cleanup xxtea reference sources
 2020-02-15 23:48:21 +08:00
halx99 78cd37f01a Sync https://github.com/cocos2d/cocos2d-x/pull/20457 2020-02-15 21:38:37 +08:00
halx99 853e6b92e2 Update features status 2020-02-15 21:20:22 +08:00
halx99 52d8799d64 Remove xxtea, cleanup xxtea reference sources 2020-02-15 20:54:33 +08:00
halx99 f46c9575a4 Merge: f7330a9b3c e2c4b786b8 
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 bc343072ce Call initWithZeros at constructor once is works 2020-02-15 17:35:44 +08:00
halx99 f45bcbc723 Refine sources 2020-02-15 10:48:44 +08:00
halx99 8d0d83b2ee fix ci error 2020-02-15 03:10:01 +08:00
halx99 e065f94aa4 Remove unnecessary constructors. 2020-02-15 02:58:41 +08:00
halx99 3ebacd33e9 Refine STMGT 2020-02-15 02:36:02 +08:00
halx99 be59a192c1 Move maxTextureIdx to base texture class 2020-02-14 23:42:05 +08:00
halx99 46c8fff152 Merge: 5a83d24b2f a460438c3b 
Merge pull request #56 from c4games/astc-ios

Make astc works on ios platform.
 2020-02-14 23:23:07 +08:00
halx99 67c153f589 Make multi-meta-textures support works on Metal. 2020-02-14 21:40:33 +08:00
halx99 55f96054b7 Update deps to v29 2020-02-14 19:14:39 +08:00
halx99 72eaf595b5 Make astc works on ios platform. 2020-02-14 19:10:01 +08:00
halx99 b108276f56 Refine extensions output. 2020-02-14 16:03:58 +08:00
halx99 35ca58fab2 fix compile error 2020-02-14 15:44:46 +08:00
halx99 f1df405e82 fix #53 2020-02-14 15:18:56 +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
weiwest a998fe8c14 Merge: 2a02db76d8 2d3e162e21 
Merge remote-tracking branch 'upstream/master'
 2020-02-12 16:58:47 +08:00
weiwest ee875efab0 remove test log 2020-02-12 15:52:08 +08:00
weiwest 33b9e8330b add astc soft decode support 2020-02-11 23:54:17 +08:00
halx99 d573dc14bc Update README.md 2020-02-11 21:03:22 +08:00
halx99 61b9e21b51 Merge: e698c3ed81 3fb83491c5 
Merge pull request #48 from c4games/fix-ios-link-error

fix ios openssl link error
 2020-02-11 13:32:42 +08:00
halx99 579eeb5e7b Merge: 33d3721c6a 33e765455c 
Merge pull request #47 from c4games/ios-build-guides

Update README.md
 2020-02-08 22:33:14 +08:00
halx99 9b3dfe29a7 fix ios openssl link error 2020-02-08 22:10:08 +08:00
halx99 b4a63a85c9 Update README.md 2020-02-08 21:55:36 +08:00
halx99 17cfcb32be Disable lua binding gen test, fix later 2020-02-08 17:03:14 +08:00
halx99 10e3965bf8 fix cmake gen command for vs2019 2020-02-08 15:41:13 +08:00
halx99 9efff64c9e Upgrade win32 compile tools to vs2019 2020-02-08 14:11:28 +08:00
halx99 eec29eb3be Reset ios toolchain 2020-02-07 20:59:22 +08:00
halx99 fcbc5afbb3 Merge: b39b6e9acb cffc332499 
Merge pull request #44 from halx99/master

Fix travis ci ios build issue
 2020-02-07 19:56:34 +08:00
halx99 b2f30327d7 Update ios cmake guide 2020-02-07 19:28:41 +08:00
halx99 3c71559b17 Use ios.toolchain.cmake 2020-02-07 19:26:45 +08:00
halx99 e1d937bb1a Update README.md 2020-02-07 19:21:19 +08:00
halx99 dc05990b87 Update README.md 2020-02-07 19:04:26 +08:00
halx99 209fbae7bf Add ios.toolchain.cmake 2020-02-07 18:59:44 +08:00
halx99 12e07bce14 Merge: 8a7a785137 38564c696d 
Merge pull request #43 from halx99/master

fix ci [fork:halx99-appveyor]
 2020-02-07 17:17:50 +08:00
halx99 cae5a84c1b fix ci error for PLATFORM_TARGET_MAC 2020-02-07 16:51:57 +08:00
halx99 9a5d6b4f5e Sync lua bindings for UserDefault Refactor 2020-02-07 16:45:25 +08:00
halx99 dc09756a94 disable other jobs exclude android & ios 2020-02-07 16:41:34 +08:00
halx99 25ec31f938 test iphoneos 2020-02-07 16:14:27 +08:00
halx99 c560d675bd Update appveyor status url 2020-02-07 15:41:05 +08:00
huizhen c1c6e13fea Merge: 45f1fb5265 70cb64854f 
Merge pull request #40 from halx99/master

Refactor UserDefault, cbc128 encrypt support.
 2020-02-07 12:07:10 +08:00