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

38281 Commits

Author SHA1 Message Date
huizhen 4129218d44
Merge pull request #40 from halx99/master 
Refactor UserDefault, cbc128 encrypt support.
 2020-02-07 12:07:10 +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
HALX99 45f1fb5265
Merge pull request #39 from halx99/master 
Refactor UserDefault, add plain mode for win32.
 2020-02-06 23:28: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 ffcb65fdaa
Merge pull request #38 from c4games/halx99-ios-guide 
Add ios guide to readme.
 2020-02-06 12:52:48 +08:00
HALX99 08ddf4ce33
Add ios guide to readme. 2020-02-06 12:52:13 +08:00
huizhen 1f7a7a6937
Merge pull request #36 from halx99/master 
Refactor UserDefault, use file mapping implementation.
 2020-02-06 12:23:44 +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 30e21d3b08
Merge pull request #35 from weiwest/master 
add windows android start guide
 2020-02-04 22:56:49 +08:00
halx99 b6cf5871cd Refactor UserDefault, use file mapping & plain binary encode/decode for all platform 2020-02-04 22:28:54 +08:00
weiwest 36f0d0b902 add windows android start guide 2020-02-04 21:42:43 +08:00
HALX99 8cb437601f
Merge pull request #34 from halx99/master 
Update deps to v26
 2020-02-04 21:16:49 +08:00
HALX99 da52ffa669
update deps to v26 2020-02-04 21:15:18 +08:00
HALX99 2c5653a95f
Merge pull request #1 from c4games/master 
Fix .so auto link when folder not exists
 2020-02-04 21:11:49 +08:00
halx99 3f78448495 Fix .so auto link when folder not exists 2020-02-04 20:57:20 +08:00
halx99 86d6e5d58d Merge branch 'master' of https://github.com/c4games/engine-v5 2020-02-04 20:55:37 +08:00
halx99 a40c81e984 load .so at AppActivity.java 2020-02-04 19:22:11 +08:00
HALX99 c69c8edda2
Update config.json 2020-02-04 12:40:20 +08:00
halx99 1b33d88416 fix compile issue 2020-02-03 22:01:18 +08:00
halx99 a350f4be88 solve auto link .so for android platform 2020-02-03 21:18:23 +08:00
halx99 6f4b1f4d9e fix link error 2020-02-02 21:53:18 +08:00
HALX99 9632461bea
Merge pull request #33 from simdsoft/deps24 
update deps to v24
 2020-02-02 21:33:40 +08:00
HALX99 215312c94e
Update config.json 2020-02-02 20:32:00 +08:00
halx99 2fb5981500 Merge branch 'master' of https://github.com/simdsoft/engine-v5 2020-01-18 20:41:29 +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
minggo 589e09c328 set xcode installation path to (#20402) 2020-01-18 20:40:21 +08:00
RH 93352ff06f 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 3b3086b8d8 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 2fdb65e2c6 set attribute (#20417) 2020-01-18 20:40:09 +08:00
coulsonwang 025244b7dd fix memory leak (#20423) 2020-01-18 20:40:05 +08:00
Arnold cdc0d4702c [bugfix] set CFBundleExectuable in template info.plist (#20425) 
fix #20414
 2020-01-18 20:40:00 +08:00
HALX99 5f6b75ccf8
Merge pull request #31 from simdsoft/deps-v23 
Update deps to v23
 2020-01-09 13:47:09 +08:00
HALX99 7e4ce9593f
Update config.json 2020-01-09 00:30:07 +08:00
HALX99 4c7777e8b0
Merge pull request #30 from simdsoft/deps-v22 
Update deps to v22
 2020-01-08 04:36:29 +08:00
HALX99 ea70d4add6
Update config.json 2020-01-08 03:38:08 +08:00
HALX99 b5e525e003
Merge pull request #29 from simdsoft/deps-v21 
Update deps to v21
 2020-01-07 02:30:04 +08:00
halx99 c3d6327a04 fix downloader impl 2020-01-06 02:36:36 +08:00
HALX99 7136de50c3
Update config.json 2020-01-05 16:38:47 +08:00
HALX99 65ffc60d81
Merge pull request #28 from simdsoft/deps-v20 
Update deps to v20
 2020-01-05 16:38:18 +08:00
HALX99 9544d112c4
Update config.json 2020-01-05 04:25:31 +08:00
halx99 d3aabf3f89 Add test case for yasio 2020-01-05 04:24:13 +08:00
halx99 00e0beba1c Merge branch 'master' of https://github.com/simdsoft/engine-v5 2020-01-05 04:23:25 +08:00
halx99 344d6a6488 fix compile issue 2020-01-05 04:22:41 +08:00
HALX99 9df905b580
Merge pull request #27 from simdsoft/deps-v19 
Update deps to v19 [spine-v3.8]
 2020-01-05 04:21:32 +08:00