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

37512 Commits

Author SHA1 Message Date
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
HALX99 0300fd3bcd
Update config.json 2020-01-05 03:18:14 +08:00
halx99 a2eb8507bb [v4] spine v3.8 2020-01-05 03:09:32 +08:00
halx99 0d5a07450d Optimize downloader 2020-01-04 22:25:01 +08:00
coulsonwang 43ffe28ce9 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 de96a3fe1b fix luabindings 52/53 compat 2019-12-29 21:31:19 +08:00
HALX99 e566f682da
Merge pull request #26 from simdsoft/deps-v18 
Update deps to v18
 2019-12-29 18:06:00 +08:00
HALX99 8dbe6cf519
Update config.json 2019-12-29 16:16:12 +08:00
HALX99 befe7c9ed4
Merge pull request #25 from simdsoft/deps-v16 
Update deps to v16
 2019-12-15 03:22:23 -08:00
HALX99 237a2ade9a
Update deps to v16 2019-12-15 01:05:32 +08:00
RH deffc2cbef Fix for issue #19890 (#20407) 2019-12-12 23:55:23 +08:00
Arnold b74af1970b [bugfix] set Info.plist path (#20405) 
fix bug introduced in #20205
 2019-12-12 23:55:18 +08:00
minggo 87c96a7b23 update error link 2019-12-12 23:55:05 +08:00
halx99 1747da5e3d Remove license files. 2019-12-12 23:53:27 +08:00
coulsonwang ec0edf31ff no need to convert to RGBA8888 when it is DEFAULT (#20397) 2019-12-12 23:49:08 +08:00
CocosRobot d3a703e0ff [ci skip][AUTO]: updating luabinding & cocos_file.json automatically (#20393) 2019-12-12 23:48:51 +08:00
halx99 4e0f7b63a4 Initial adapter spine runtime. 2019-12-12 23:26:12 +08:00
halx99 6fac56b69b Remove extension UI system deps 2019-12-12 23:24:50 +08:00
halx99 3a877c50f2 fix SpritePolygonTest 2019-12-03 00:50:11 +08:00
HALX99 9d48d0033b
Merge pull request #24 from simdsoft/fix-etc1 
fix etc1 supported for android platform.
 2019-12-02 08:12:35 -08:00