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

163 Commits

Author SHA1 Message Date
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 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 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 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
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
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
halx99 34dfdde0d4 fix downloader impl 2020-01-06 02:36:36 +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
RH 2b3c2872b7 Fix for issue #19890 (#20407) 2019-12-12 23:55:23 +08:00
coulsonwang 2ed3343bea no need to convert to RGBA8888 when it is DEFAULT (#20397) 2019-12-12 23:49:08 +08:00
halx99 9553236c72 Initial adapter spine runtime. 2019-12-12 23:26:12 +08:00
halx99 bea629e5a6 Remove extension UI system deps 2019-12-12 23:24:50 +08:00
halx99 2a091cc86f fix etc1 supported for android platform. 2019-12-02 23:01:06 +08:00
halx99 aaddb886c7 multi texture GPU handler for compressed image 2019-12-01 23:26:11 +08:00
halx99 a196b88075 Refactor audio, fix android compile issue since we remove SimpleAudio 2019-12-01 13:45:49 +08:00
halx99 a9776f7c49 Update javaactivity-android.cpp 2019-12-01 03:15:14 +08:00
halx99 ce48dfe27e usedefault, fix compile issue for android 2019-12-01 02:32:37 +08:00
halx99 aef75961a7 fix compile issue 2019-12-01 01:38:30 +08:00
halx99 cc56e8e8ba fix indent 2019-12-01 01:24:40 +08:00
halx99 3582e188f1 Add ZipFileStream support 2019-12-01 01:16:46 +08:00
halx99 410ceb8143 Update CCFileUtils-android.cpp 2019-11-30 23:57:35 +08:00
halx99 3c409df074 Remove namespace experimental AudioDecoderEXT.h 2019-11-30 17:30:48 +08:00
halx99 ee4ec1d8c3 Optimize audio sources 2019-11-30 17:27:51 +08:00
minggo 2b521922fa fix flicker of fast tilemap (#20387) 2019-11-30 16:58:55 +08:00
CocosRobot 5c2f06ff55 [ci skip][AUTO]: updating luabinding & cocos_file.json automatically (#20378) 2019-11-30 16:55:06 +08:00
coulsonwang e45693de51 fix incorrect hash structure for RenderPipeline (#20373) 
* fix incorrect hash structure for RenderPipeline
 2019-11-30 16:54:50 +08:00
Saber Haj Rabiee b1120c870f Fix to properly delete easingParams array (#20375) 2019-11-30 16:54:46 +08:00
halx99 0538506b05 update audio, deps-9, ci for windows 2019-11-30 16:20:25 +08:00
halx99 dbf2cbfd4d fix compile issue 2019-11-30 14:32:18 +08:00
halx99 1c34056ec4 Sync audio header files 2019-11-30 14:21:36 +08:00
halx99 021a2e5733 Merge: 8ad51f748d 5a2e9e4930 
Merge pull request #14 from simdsoft/upto-deps-7

update to deps-7
 2019-11-29 15:19:39 -08:00
halx99 9b298cde3c optimize 2019-11-30 06:55:32 +08:00
halx99 51383683ce Merge: 9807664441 4e671a97b9 
Merge branch 'master' of https://github.com/simdsoft/engine-v5
 2019-11-30 06:48:25 +08:00
halx99 7af7b6494c Update config.json 2019-11-30 06:19:15 +08:00
halx99 45dbdc8c7d fix indent 2019-11-30 06:17:33 +08:00
halx99 17ffccfdf4 ogg for ios 2019-11-30 06:11:17 +08:00
halx99 9bb13d379d Use macro CC_BUILD_WITH_DRANGBONES to control whether build dragonbones, default is disabled. 2019-11-30 01:32:12 +08:00
halx99 7d183d5a39 Update CCFileUtils.cpp 2019-11-28 09:59:18 +08:00
halx99 cce30823f7 use S_ISREG to check is a regular file? 2019-11-27 15:41:30 +08:00
halx99 ac789dbf81 a. use win32 api to get fie size; b. use int64_t for file size, c. use stat to check whether file exist for android platform. 2019-11-27 15:09:45 +08:00
halx99 9d53924e4c Remove unused function. 2019-11-27 14:44:30 +08:00
halx99 db27a92625 don't convert path to utf-8 on win32 platform 2019-11-27 14:34:40 +08:00
halx99 d5af773970 Merge: f8e6c06286 cea283c489 
Merge pull request #11 from simdsoft/sync-v4

Sync v4
 2019-11-26 08:49:56 -08:00
halx99 217962e748 Merge: 3cab821c25 8ff2ea18c2 
Merge pull request #10 from simdsoft/v5-deps-5

update deps to v5-deps-5
 2019-11-26 08:28:03 -08:00
codetypes 7969eabbed missing implementation for TiledGrid3DAction::create (#20370) 2019-11-26 23:40:44 +08:00
halx99 c59a63d273 fix update 2019-11-26 23:37:27 +08:00
halx99 1dde48bebd fix ci warnings 2019-11-26 22:37:20 +08:00
halx99 1cd5dc4c1b fix missing includes 2019-11-26 22:17:57 +08:00
halx99 5cd834809f change GLubyte to uint8_t 2019-11-26 18:40:39 +08:00
halx99 009aa54a0b add missing include file 2019-11-26 18:07:51 +08:00
halx99 09ab1e75d0 add missing include file 2019-11-26 17:51:16 +08:00
halx99 8060560313 fix compile issue caused by fbs 2019-11-26 16:37:39 +08:00
halx99 dd0669b99b Merge: 4bd8c03dba 08b8f087c2 
Merge pull request #7 from simdsoft/fix-ud

Remove tinyxml2, sync ios & android platform.
 2019-11-25 23:59:14 -08:00
halx99 dad6499592 Remove tinyxml2, sync ios & android platform. 2019-11-26 12:11:56 +08:00
halx99 15e690ec7e fix prid 2019-11-26 10:21:21 +08:00
halx99 0e94bc8139 Update AudioEngineImpl.mm 2019-11-26 09:54:25 +08:00
halx99 8e3ecda6f3 fix typo, GLenum to ALenum 2019-11-26 03:07:55 +08:00
halx99 4457c26a7e fix ios compile issue, merge header AudioCache.h 2019-11-26 02:33:54 +08:00
halx99 ada10077b5 Merge: 72c1f27ce4 8cb40c339a 
Merge pull request #3 from simdsoft/update-readme

Update README.md
 2019-11-25 09:36:20 -08:00
halx99 6dc19cfbae Update ProgramStateRegistry.cpp 2019-11-25 21:23:29 +08:00
halx99 fa1b56e251 fix CMakeLists.txt for apple 2019-11-25 20:55:41 +08:00
halx99 00ededdbb4 skip gen luabindings for ci 2019-11-25 20:32:43 +08:00
halx99 c77560fb80 Make writeValueMapToFile works well with pugixml. 2019-11-25 20:26:29 +08:00
halx99 bf392e7fa0 Optimize CCDownloader, stop thread properly. 2019-11-25 18:50:50 +08:00
halx99 0536b38509 Use toString instead asString 2019-11-25 18:02:13 +08:00
halx99 d1982f7c00 fix AudioInfo construct. 2019-11-25 17:21:07 +08:00
halx99 075aadee32 Use '/' instead "/" for find & string append. 2019-11-25 17:10:25 +08:00
halx99 521ff411a5 Merge: 5f1dc7c748 6000f7b796 
Merge branch 'master' of https://github.com/simdsoft/engine-v5
 2019-11-25 17:06:24 +08:00
halx99 5faf15e10f Use toString instead. 2019-11-25 17:06:01 +08:00
halx99 f59bcb1ab0 Update CCSAXParser.cpp 2019-11-25 14:46:56 +08:00
halx99 a56cddfefe Remove getSuitableFopen, we never reduce performance for win32 only 2019-11-25 02:54:00 +08:00
halx99 442012b525 Improve CCImage, BMP support. 2019-11-25 02:28:38 +08:00
halx99 2b5ce77ac7 lua53 compat, both lua51, lua52, luat3, luajit are supported. 2019-11-25 01:59:08 +08:00
halx99 8333e4c06e Remove tinyxml2 dep, done. 2019-11-25 01:35:26 +08:00
halx99 0ab49ddf22 Merge: 98a3bd35f0 f332ae77c1 
Merge branch 'master' of https://github.com/simdsoft/engine-v5
 2019-11-24 23:16:11 +08:00