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

2818 Commits

Author SHA1 Message Date
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
halx99 d38b5a1310 fix comment. 2020-02-06 23:33:12 +08:00
halx99 b32d0b0afe Refactor UserDefault, cbc128 encrypt support. 2020-02-06 23:30:33 +08:00
halx99 aa4d08eb3f Merge: ffcb65fdaa e10155bef4 
Merge pull request #39 from halx99/master

Refactor UserDefault, add plain mode for win32.
 2020-02-06 23:28:33 +08:00
weiwest 2acb59d377 add astc support 8x8 block size 2020-02-06 21:54:45 +08:00
halx99 277120ead1 Refactor UserDefault, add plain mode for win32. 
plain mode: 760ms
binary mode: 11ms
 2020-02-06 21:15:15 +08:00
halx99 fcc061bc22 Add ios guide to readme. 2020-02-06 12:52:13 +08:00
huizhen 1fa510712e Merge: 30e21d3b08 21b378ead3 
Merge pull request #36 from halx99/master

Refactor UserDefault, use file mapping implementation.
 2020-02-06 12:23:44 +08:00
halx99 062c99844e Refactor UserDefault, handle error & fix can't enlarge problem. 2020-02-06 11:55:28 +08:00
halx99 a91953ac1a Refactor UserDefault, optmize for huge entities. 2020-02-06 01:08:51 +08:00
weiwest 27927bbcb3 add astc support 2d 4x4 RGBA 2020-02-05 22:45:19 +08:00
halx99 29f3ffc66e Merge: 8cb437601f 36f0d0b902 
Merge pull request #35 from weiwest/master

add windows android start guide
 2020-02-04 22:56:49 +08:00
halx99 7ad3f908b6 Refactor UserDefault, use file mapping & plain binary encode/decode for all platform 2020-02-04 22:28:54 +08:00
weiwest 6e4f1fb65e add windows android start guide 2020-02-04 21:42:43 +08:00
halx99 a95a49713a Fix .so auto link when folder not exists 2020-02-04 20:57:20 +08:00
halx99 9793a9dd7f load .so at AppActivity.java 2020-02-04 19:22:11 +08:00
halx99 325db43cdb fix compile issue 2020-02-03 22:01:18 +08:00
halx99 6aacce867f solve auto link .so for android platform 2020-02-03 21:18:23 +08:00
coulsonwang 95bb7d6b5a fix drawnode line width issue (#20442) 2020-01-18 20:40:34 +08:00
coulsonwang 8c8280c7d6 fix memory leak issue (#20440) 2020-01-18 20:40:30 +08:00
CocosRobot 71da768d3c [ci skip][AUTO]: updating luabinding & cocos_file.json automatically (#20438) 2020-01-18 20:40:25 +08:00
minggo 4f6a6b0960 set xcode installation path to (#20402) 2020-01-18 20:40:21 +08:00
RH f1c58b23e2 V4 bmfont improved api (#20406) 
* Merged improved BM font API from Cocos2d-x V3.  Code based on #20309 and #20300

* Added missing test resources.
 2020-01-18 20:40:17 +08:00
RH 1f7e7b238e V4 uilayout scissorclipping fix (#20415) 
* Fix for issue #19890

* Updated with better fix from the V3 PR #18651

* Formatting fix

* Fixed issue with incorrect type (double instead of float) when compiling on certain platforms.

* Another attempt to fix compilation issue
 2020-01-18 20:40:13 +08:00
Arnold 1cd85b88d0 set attribute (#20417) 2020-01-18 20:40:09 +08:00
coulsonwang 69b1f6f8fd fix memory leak (#20423) 2020-01-18 20:40:05 +08:00
Arnold a0e24c4c42 [bugfix] set CFBundleExectuable in template info.plist (#20425) 
fix #20414
 2020-01-18 20:40:00 +08:00
halx99 34dfdde0d4 fix downloader impl 2020-01-06 02:36:36 +08:00
halx99 b94c50f126 Add test case for yasio 2020-01-05 04:24:13 +08:00
halx99 79825fafbc fix compile issue 2020-01-05 04:22:41 +08:00
halx99 8cc7800ea8 [v4] spine v3.8 2020-01-05 03:09:32 +08:00
halx99 d4f6ac6482 Optimize downloader 2020-01-04 22:25:01 +08:00
coulsonwang 3541d06339 set gl framebuffer read and write back again (#20403) 
* set gl framebuffer read and write back again

* update review
 2019-12-29 23:07:19 +08:00
halx99 ed1e0744c4 fix luabindings 52/53 compat 2019-12-29 21:31:19 +08:00