Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
38,051 Commits 3 Branches 34 Tags 1.2 GiB
Commit Graph

13852 Commits

Author SHA1 Message Date
halx99 3e95b8ccf3 Unify plist implementation, remove apple specific sources. 2020-08-03 10:48:26 +08:00
halx99 6fd4d6e4ab Adapte multi monitors 2020-08-03 10:33:04 +08:00
halx99 f396ba9983 Unnecessary space lilne [skip appveyor] [skip travis] 2020-08-02 17:00:35 +08:00
halx99 99432aa171 Optimize param use. 2020-08-02 16:48:19 +08:00
halx99 a624babd09 vidMode need moniter 2020-08-02 16:36:58 +08:00
halx99 020b0ff79c Update comment [skip appveyor] [skip travis] 2020-08-02 16:24:30 +08:00
halx99 6a133fa1e5 check isFullscreen 2020-08-02 16:22:41 +08:00
halx99 dd226789b3 Provide more useful for setFullscreen with width,height,refreshRate. 2020-08-02 16:18:39 +08:00
halx99 106d8e2ecf Refactor full screen support, fix different behavior when enter full screen between 1 and >=2 times 2020-08-02 11:54:46 +08:00
halx99 aa59cf6876 Add wav testcase 2020-08-01 19:25:39 +08:00
halx99 fd8f6a01d5 fix #129 2020-08-01 11:23:13 +08:00
halx99 7ecb85019a fix #127 2020-07-31 17:23:03 +08:00
halx99 82314c2972 Add alconfig.h to choose whether use openal-soft 2020-07-31 17:03:58 +08:00
halx99 2163f9c440 Add missing detect macro CC_USE_ALSOFT_ON_APPLE on apple platform 2020-07-31 16:36:45 +08:00
halx99 95cae56768 Update comment [skip appveyor] [skip travis] 2020-07-31 15:49:50 +08:00
halx99 786eaafe56 Tidy audio source, unify headers: AudioEngineImpl.h AudioPlayer.h 2020-07-31 14:32:08 +08:00
halx99 ccc5cde3d9 Refine message output [skip travis] [skip appveyor] 2020-07-31 11:35:52 +08:00
halx99 005ec45f0a fix option order 2020-07-31 11:22:42 +08:00
halx99 589225f2e7 [Audio] Use apple system decoder for non .ogg audio files 2020-07-31 00:31:39 +08:00
halx99 594767290d Add CMAKE option CC_USE_ALSOFT_ON_APPLE to use kcat openal-soft on apple platform, by default currently OFF 2020-07-31 00:06:59 +08:00
halx99 0d8457e9af Use std::vector<char> to manage pcmData buffer on AudioCache, remove unused source from AudioCache.mm 2020-07-30 18:09:50 +08:00
halx99 e250fe3707 Fix dead-lock when play/stopAll immidiately 2020-07-30 17:26:54 +08:00
halx99 dda5628876 Sync missing fixs from v3, see: https://github.com/cocos2d/cocos2d-x/pull/19240 2020-07-30 17:07:38 +08:00
halx99 58c4fb32c1 Sync fix from v3, see also: https://github.com/cocos2d/cocos2d-x/pull/20509 2020-07-30 10:59:50 +08:00
halx99 a735abaf65 Take care _programState use 2020-07-21 23:11:03 +08:00
halx99 7322e690eb fix compile issue on iOS 2020-07-21 23:05:25 +08:00
halx99 41ad75bdb3 fix lua link error 2020-07-20 17:00:48 +08:00
HALX99 5686e15746
Merge pull request #109 from halx99/win-utf8 
Improve utf-8 path on win32, explicit call wide version of system API.
 2020-07-10 16:56:18 +08:00
HALX99 db0ed5bd59
Merge pull request #111 from halx99/fix-type-error 
fix type error, well xxhash never generate 0 for validate draw command.
 2020-07-10 16:42:57 +08:00
halx99 d20d3fd241 fix type error, well xxhash never generate 0 for validate draw command. 2020-07-10 15:55:31 +08:00
halx99 7b82d47fcf Correct feature test when use angle backend 2020-07-10 15:16:44 +08:00
halx99 c9e1df125a Improve utf-8 path on win32, explicit call wide version of system API. 2020-07-10 15:14:16 +08:00
halx99 e5815f9cd8 Adapte glfw-3.4 2020-07-03 11:08:39 +08:00
halx99 bfd1709ab7 Optimzie writeStringToFile 2020-06-14 15:54:55 +08:00
halx99 208bc9fe6f ios don't support thread local storage 2020-06-14 15:52:15 +08:00
halx99 786ad14b68 fix ios compile error 2020-06-14 13:58:29 +08:00
halx99 93a3452261 finish angle dependencies auto copy for win32, make flatbuffers dep header only 2020-06-14 12:50:20 +08:00
halx99 3d3fea28c6 Support use google angle support on windows. 2020-06-12 12:42:58 +08:00
halx99 cd656f8b8b fix label not rendering 2020-06-12 11:34:02 +08:00
halx99 9da96e3e1a Sync from: https://github.com/cocos2d/cocos2d-x/pull/20531 2020-06-12 11:24:10 +08:00
halx99 484e4be579 [Audio] Improve mutex use 2020-06-04 23:11:24 +08:00
HALX99 2d5644be70
Remove unused macro 2020-06-04 12:55:22 +08:00
halx99 2cbb902813 [WAV] Finished MSADPCM & IMA4 compress format support. 2020-06-04 12:26:25 +08:00
halx99 24a1d685b9 Provide framesToBytes instead getBytesPerFrame 2020-06-03 23:09:45 +08:00
halx99 0cf706c2d9 fix enum. 2020-06-02 12:18:12 +08:00
halx99 d6da5a4d32 Use store bitsPerFrame as-is instead bytesPerFrame. 2020-06-02 12:09:51 +08:00
HALX99 a434e0c37d
Optimize, avoid include self. 
Even through all compiler can handle it, we should not do that include, thanks: https://github.com/cocos2d/cocos2d-x/pull/20525
 2020-05-20 08:56:12 +08:00
halx99 d80bb6ecf5 Update copyright 2020-05-19 12:52:34 +08:00
halx99 1e130c4533 Merge branch 'master' of https://github.com/halx99/engine-x 2020-05-19 12:50:25 +08:00
HALX99 b65c4ddadc
Fix ci compile issue. 2020-05-19 12:49:34 +08:00
halx99 8cb24b066f Fix play some .wav file have tail noise, at non-apple platforms we use mpg123,ogg,wav decoder, so don't need workaround to adjust tail frame. 2020-05-19 12:19:29 +08:00
halx99 e9d974f02b Remove win32 spec include. 2020-05-19 12:13:34 +08:00
halx99 c5492969a2 Fix wav decoder when Format chunck have EXT info 2020-05-19 11:42:54 +08:00
halx99 94c6e5a47b Apple platform no alext.h 2020-05-18 18:36:21 +08:00
halx99 df70c7e691 Add all audio source format supported by OpenAL 2020-05-18 17:30:42 +08:00
halx99 5a165dd270 Improve bit depth support, both 8bit, 16bit, 32bit FLT, 64bit DBL 2020-05-18 14:56:13 +08:00
HALX99 34e268ad56
Fix compile error 2020-05-18 10:13:57 +08:00
HALX99 74f03ad435
fix missing include header file 2020-05-18 09:21:52 +08:00
halx99 5a0bdc1e81 fix #89 2020-05-17 17:15:10 +08:00
halx99 6987372798 Optimize wav decoder code 2020-05-17 16:58:54 +08:00
halx99 1a5a2cbe38 Improve StringUtils::format reuseable, see #88 2020-05-15 22:57:33 +08:00
halx99 ffaa65366e fix typo 2020-05-11 23:00:02 +08:00
halx99 bc4eab96d5 fix #86 2020-05-06 16:28:34 +08:00
halx99 40cb068201 finish issue: #85 2020-05-06 15:42:25 +08:00
HALX99 61b14bf86c
fix memory leak & correct indent 2020-03-30 14:54:13 +08:00
HALX99 39f3dd6586
Remove unused src 2020-03-05 20:47:11 +08:00
halx99 b24d244f6e Remove unused Android.mk files 2020-03-04 22:59:33 +08:00
HALX99 04ac727c8e
fix ios compile error 2020-03-03 20:05:56 +08:00
halx99 e379fc513d Refactor CCValue. 2020-03-03 19:24:07 +08:00
halx99 4414e64dd6 Use original c lib minizip-1.2.0 2020-02-28 13:55:25 +08:00
halx99 f91ed91688 Remove unnecessary std::move semantics 2020-02-28 12:10:27 +08:00
halx99 a558bc2198 Optimize & sync sources 2020-02-28 02:15:33 +08:00
halx99 ddb30e881c Clean JSB sources, optmize script event dispatch. 2020-02-28 02:15:33 +08:00
HALX99 23b3deaa23
Merge pull request #72 from c4games/sync-v3-pr20107 
Sync v3 pr20107 & fix builtin shaders
 2020-02-24 20:59:11 +08:00
HALX99 b350a7abf8
Merge pull request #71 from c4games/sync-v3-pull-19256 
Sync v3 pr-19256
 2020-02-24 19:52:22 +08:00
HALX99 0c291dd470
Merge pull request #70 from c4games/remove-unused-shader 
Remove unused shader
 2020-02-24 17:51:58 +08:00
halx99 d9e6cb8e33 Sync v3 pr20107 & fix builtin shaders, see: https://github.com/cocos2d/cocos2d-x/pull/20107 2020-02-24 17:09:25 +08:00
halx99 f0d60d4a85 Fixup, optimize shader compile log. 2020-02-24 16:27:10 +08:00
halx99 f5eac1eede Sync v3 pr-19256, see: https://github.com/cocos2d/cocos2d-x/pull/19256 2020-02-24 16:22:40 +08:00
halx99 a7e118ec0b Remove unused shader 2020-02-24 16:13:49 +08:00
halx99 ab84b8be19 Add missing header 2020-02-23 21:36:36 +08:00
halx99 2086cf04d3 fix indent 2020-02-23 21:31:55 +08:00
halx99 3e0ca066ba fix #41 2020-02-23 21:27:14 +08:00
HALX99 169fd54f62
Remove duplicated code 2020-02-17 20:21:43 +08:00
HALX99 a5de6b810b
Fix adjust issue at Texture2DGL::initWithZeros 2020-02-17 00:13:56 +08:00
halx99 b76cd80043 Sync for glad 2020-02-16 16:44:14 +08:00
halx99 1f9f27d63f Use modern gl/gles loader 'glad' to instead 'glew' 2020-02-15 23:51:23 +08:00
HALX99 1d551a1897
Merge pull request #60 from c4games/remove-xxtea 
Remove xxtea, cleanup xxtea reference sources
 2020-02-15 23:48:21 +08:00
halx99 d3162956e7 Sync https://github.com/cocos2d/cocos2d-x/pull/20457 2020-02-15 21:38:37 +08:00
halx99 5416b4d34c Remove xxtea, cleanup xxtea reference sources 2020-02-15 20:54:33 +08:00
HALX99 b8986f339b
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 e2c4b786b8 Call initWithZeros at constructor once is works 2020-02-15 17:35:44 +08:00
halx99 effc75bd78 Refine sources 2020-02-15 10:48:44 +08:00
halx99 8aee15f7c0 fix ci error 2020-02-15 03:10:01 +08:00
halx99 78f9dfa8ef Remove unnecessary constructors. 2020-02-15 02:58:41 +08:00
halx99 3bea76ee4d Refine STMGT 2020-02-15 02:36:02 +08:00
halx99 4c9e87ac51 Move maxTextureIdx to base texture class 2020-02-14 23:42:05 +08:00
HALX99 f7330a9b3c
Merge pull request #56 from c4games/astc-ios 
Make astc works on ios platform.
 2020-02-14 23:23:07 +08:00
halx99 54fecde8a2 Make multi-meta-textures support works on Metal. 2020-02-14 21:40:33 +08:00
halx99 2bf350beb0 Update deps to v29 2020-02-14 19:14:39 +08:00
halx99 a460438c3b Make astc works on ios platform. 2020-02-14 19:10:01 +08:00
halx99 5778ac9da1 Refine extensions output. 2020-02-14 16:03:58 +08:00
halx99 70561f2c0e fix compile error 2020-02-14 15:44:46 +08:00
halx99 2fe58e86ae fix #53 2020-02-14 15:18:56 +08:00
HALX99 deb7c48844
Merge pull request #52 from c4games/fix-issue51 
fix #51
 2020-02-12 20:58:25 +08:00
halx99 f36d21c9bf fix #51 2020-02-12 20:15:09 +08:00
weiwest 89105d0db2 Merge remote-tracking branch 'upstream/master' 2020-02-12 16:58:47 +08:00
weiwest 2a02db76d8 remove test log 2020-02-12 15:52:08 +08:00
weiwest 9496d34470 add astc soft decode support 2020-02-11 23:54:17 +08:00
halx99 38564c696d fix ci error for PLATFORM_TARGET_MAC 2020-02-07 16:51:57 +08:00
halx99 f9b8460aeb Sync lua bindings for UserDefault Refactor 2020-02-07 16:45:25 +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
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 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 b6cf5871cd Refactor UserDefault, use file mapping & plain binary encode/decode for all platform 2020-02-04 22:28:54 +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
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
halx99 c3d6327a04 fix downloader impl 2020-01-06 02:36:36 +08:00
halx99 344d6a6488 fix compile issue 2020-01-05 04:22:41 +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
RH deffc2cbef Fix for issue #19890 (#20407) 2019-12-12 23:55:23 +08:00
coulsonwang ec0edf31ff no need to convert to RGBA8888 when it is DEFAULT (#20397) 2019-12-12 23:49:08 +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 1b2e112383
fix etc1 supported for android platform. 2019-12-02 23:01:06 +08:00
halx99 d36f53e567 multi texture GPU handler for compressed image 2019-12-01 23:26:11 +08:00
halx99 2f4109dd2d Refactor audio, fix android compile issue since we remove SimpleAudio 2019-12-01 13:45:49 +08:00
HALX99 3d1cfdb7a0
Update javaactivity-android.cpp 2019-12-01 03:15:14 +08:00
halx99 95aa5b12c4 usedefault, fix compile issue for android 2019-12-01 02:32:37 +08:00
halx99 040aebc7a3 fix compile issue 2019-12-01 01:38:30 +08:00
halx99 e4e91c0128 fix indent 2019-12-01 01:24:40 +08:00
halx99 1ed0a85613 Add ZipFileStream support 2019-12-01 01:16:46 +08:00
HALX99 e1b27ab8bc
Update CCFileUtils-android.cpp 2019-11-30 23:57:35 +08:00
halx99 461c4d3ea2 Remove namespace experimental AudioDecoderEXT.h 2019-11-30 17:30:48 +08:00
halx99 44a8309b97 Optimize audio sources 2019-11-30 17:27:51 +08:00
minggo 3ffb04f84a fix flicker of fast tilemap (#20387) 2019-11-30 16:58:55 +08:00
CocosRobot 446cf0a08d [ci skip][AUTO]: updating luabinding & cocos_file.json automatically (#20378) 2019-11-30 16:55:06 +08:00
coulsonwang 85ac704687 fix incorrect hash structure for RenderPipeline (#20373) 
* fix incorrect hash structure for RenderPipeline
 2019-11-30 16:54:50 +08:00
Saber Haj Rabiee 06804691c7 Fix to properly delete easingParams array (#20375) 2019-11-30 16:54:46 +08:00
halx99 35f2ec6897 update audio, deps-9, ci for windows 2019-11-30 16:20:25 +08:00
halx99 87e7d3b62a fix compile issue 2019-11-30 14:32:18 +08:00
halx99 9bbc68cecd Sync audio header files 2019-11-30 14:21:36 +08:00
HALX99 fafa3ab1ea
Merge pull request #14 from simdsoft/upto-deps-7 
update to deps-7
 2019-11-29 15:19:39 -08:00
halx99 9c0ef83757 optimize 2019-11-30 06:55:32 +08:00
halx99 9807664441 fix indent 2019-11-30 06:17:33 +08:00
halx99 121e09ee0d ogg for ios 2019-11-30 06:11:17 +08:00
halx99 ded0e81e5a Use macro CC_BUILD_WITH_DRANGBONES to control whether build dragonbones, default is disabled. 2019-11-30 01:32:12 +08:00
HALX99 c1a0e57c41
Update CCFileUtils.cpp 2019-11-28 09:59:18 +08:00
halx99 02c18d656a use S_ISREG to check is a regular file? 2019-11-27 15:41:30 +08:00
halx99 4a040efbf6 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 d716d9511e Remove unused function. 2019-11-27 14:44:30 +08:00
halx99 2a6cda73d7 don't convert path to utf-8 on win32 platform 2019-11-27 14:34:40 +08:00
HALX99 703a058aac
Merge pull request #11 from simdsoft/sync-v4 
Sync v4
 2019-11-26 08:49:56 -08:00
codetypes 4310342862 missing implementation for TiledGrid3DAction::create (#20370) 2019-11-26 23:40:44 +08:00
halx99 8ff2ea18c2 fix update 2019-11-26 23:37:27 +08:00
halx99 259d67b60d fix ci warnings 2019-11-26 22:37:20 +08:00
halx99 37d2952958 fix missing includes 2019-11-26 22:17:57 +08:00
halx99 073ad46a73 change GLubyte to uint8_t 2019-11-26 18:40:39 +08:00
halx99 df81bffdd2 add missing include file 2019-11-26 18:07:51 +08:00
halx99 644eef9978 add missing include file 2019-11-26 17:51:16 +08:00
halx99 b434678189 fix compile issue caused by fbs 2019-11-26 16:37:39 +08:00
HALX99 73a63bb53b
Merge pull request #7 from simdsoft/fix-ud 
Remove tinyxml2, sync ios & android platform.
 2019-11-25 23:59:14 -08:00
halx99 08b8f087c2 Remove tinyxml2, sync ios & android platform. 2019-11-26 12:11:56 +08:00
halx99 bf807f8969 fix prid 2019-11-26 10:21:21 +08:00
HALX99 8546d4d7e1
Update AudioEngineImpl.mm 2019-11-26 09:54:25 +08:00
HALX99 2f2633ec91
fix typo, GLenum to ALenum 2019-11-26 03:07:55 +08:00
halx99 7efc643e54 fix ios compile issue, merge header AudioCache.h 2019-11-26 02:33:54 +08:00
HALX99 9a1c67031a
Merge pull request #3 from simdsoft/update-readme 
Update README.md
 2019-11-25 09:36:20 -08:00
HALX99 8cb40c339a
Update ProgramStateRegistry.cpp 2019-11-25 21:23:29 +08:00
HALX99 9aeb04de4b
fix CMakeLists.txt for apple 2019-11-25 20:55:41 +08:00
halx99 6078a4c922 Make writeValueMapToFile works well with pugixml. 2019-11-25 20:26:29 +08:00
halx99 96f72d8532 Optimize CCDownloader, stop thread properly. 2019-11-25 18:50:50 +08:00
halx99 d193246f09 Use toString instead asString 2019-11-25 18:02:13 +08:00
halx99 1bcac58aad fix AudioInfo construct. 2019-11-25 17:21:07 +08:00
halx99 3ef5ab500c Use '/' instead "/" for find & string append. 2019-11-25 17:10:25 +08:00
halx99 8729ecb461 Merge branch 'master' of https://github.com/simdsoft/engine-v5 2019-11-25 17:06:24 +08:00
halx99 5f1dc7c748 Use toString instead. 2019-11-25 17:06:01 +08:00
HALX99 764109d93e
Update CCSAXParser.cpp 2019-11-25 14:46:56 +08:00
halx99 797e85ba30 Remove getSuitableFopen, we never reduce performance for win32 only 2019-11-25 02:54:00 +08:00
halx99 30ffbe1514 Improve CCImage, BMP support. 2019-11-25 02:28:38 +08:00
halx99 61223a3782 lua53 compat, both lua51, lua52, luat3, luajit are supported. 2019-11-25 01:59:08 +08:00
halx99 3fcb8883c2 Remove tinyxml2 dep, done. 2019-11-25 01:35:26 +08:00
halx99 2c55d175d3 Merge branch 'master' of https://github.com/simdsoft/engine-v5 2019-11-24 23:16:11 +08:00
halx99 98a3bd35f0 Remove tinyxml, integrate dragonbones. 2019-11-24 23:15:56 +08:00
halx99 f332ae77c1 Remove unused log. 2019-11-24 21:02:41 +08:00
halx99 cac329738d Use xsxml for sax parser, rapidxml could be removed 2019-11-24 21:01:15 +08:00
halx99 d319436cdc Remove xxtea. 2019-11-24 19:17:23 +08:00
halx99 af22abc2a8 Remove websockets, sync lua bindings. 2019-11-24 19:16:13 +08:00