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

13949 Commits

Author SHA1 Message Date
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
halx99 97e81e8180 Refactor CCDownloader, use curl for all platforms. 2019-11-24 15:43:28 +08:00
halx99 70b71c85cc Remove websockets. 2019-11-24 15:08:59 +08:00
halx99 c8f85a4a95 Refactor AudioEngine, fix compile issue. 2019-11-24 15:07:48 +08:00
halx99 a759332591 Refactor AudioEngine implementation, use OpenAL for all platforms. 2019-11-24 14:54:45 +08:00
HALX99 7723fabb78
Merge pull request #13 from cocos2d/v4 
sync V4
 2019-11-23 20:20:02 -08:00
halx99 179ec6ed67 fix ci error 2019-11-23 21:25:17 +08:00
halx99 b94d75e5d6 fix ci error. 2019-11-23 20:27:39 +08:00
codetypes e9305431da fix edit box position error (#20358) 
'sysEdit' y position is relate with frame height, not the viewport height. When in FIXED_WIDTH mode, if frame height is bigger than viewport height, it will got error y position.
 2019-11-23 18:25:49 +08:00
halx99 c180c29d32 for MTL layer 2019-11-22 22:10:55 -08:00
coulsonwang c048d6b6bd no need to update color (#20363) 2019-11-23 10:04:23 +08:00
codetypes 9b8a72a843 fix AudioEngine maybe crash on android (#20361) 
* fix AudioEngine maybe crash on android

I receive many crash about std::base_string in bugly(tencent) crash report, i can't prove those crash is relate with this, but when after  fix, i never receive again. so i think there maybe some situation will cause crash.

* type of 'filePath' change to std::string
 2019-11-23 10:00:16 +08:00
CocosRobot 191b2b8982 [ci skip][AUTO]: updating luabinding & cocos_file.json automatically (#20366) 2019-11-22 17:06:40 +08:00
codetypes c81b7a0f09 support load asset in internal storage or sdcard (#20359) 
* support load asset in internal storage or sdcard

* fix crash when fullPath.size() == 0
 2019-11-22 16:08:00 +08:00
codetypes b9df4bd63b format spelling (#20360) 2019-11-22 16:07:43 +08:00
HALX99 c08e2cda4d
Merge branch 'v4' into v4 2019-11-22 10:29:11 +08:00
halx99 78ed4e230b TextureFormatEXT 2019-11-22 03:36:01 +08:00
halx99 22d5008d28 PremultipliedAlpha 2019-11-22 01:39:03 +08:00
halx99 8b62addcec Rename parameters. 2019-11-20 19:22:22 +08:00
halx99 5d5e6fcfec Remove comment. 2019-11-20 18:44:45 +08:00
halx99 0caf671edd Fix merge error. 2019-11-20 18:35:48 +08:00
halx99 e647820c9c Merge from official-v4. 2019-11-20 18:27:56 +08:00
halx99 e7906acfa4 v4-meta-multi-textures support Single Texture2D with multi GPU texture handlers. 2019-11-20 18:19:24 +08:00
coulsonwang 912ba30e49 remove duplicated PrgramState instance in the derived class of Node (#20350) 2019-11-20 11:04:42 +08:00
codetypes d05967b69a fix setScissorRect crash (#20348) 
When part of scissorRect is out of render target viewport, it crash on mac.
Error message like this: -[MTLDebugRenderCommandEncoder setScissorRect:]:2703: failed assertion `(rect.y(568) + rect.height(447))(1015) must be <= render pass height(1000)'
 2019-11-20 11:03:59 +08:00
minggo 977510f41d
fix issue that videoplayer may crash on iOS (#20345) 2019-11-18 16:53:36 +08:00
coulsonwang b2940949dd implement setProgramState for SpriteBatchNode (#20344) 2019-11-18 15:04:47 +08:00
minggo 83b521991f
fix issue that can not close keyboard if using EditBox on iOS (#20336) (#20340) 2019-11-15 13:45:39 +08:00
Arnold 587bcabf44 fix asan reported errors (#20332) 2019-11-15 13:39:23 +08:00
minggo 9049ddbe7c
manually maintain reference count (#20329) 2019-11-15 11:39:49 +08:00
minggo bb5cf546f5
fix videoplayer crash in release mode (#20327) 2019-11-14 14:49:47 +08:00
minggo 3a36e2d5c2
Fixing a crash in iOS 9.3.5 when we have a layer with WebView getting deallocated (#20285) (#20328) 
* In case of iOS 9.3.5 when we show a web view and deallocate the layer it is trying to release memory associated with WKWebView instance, but it hadn’t retained it in the first place. This results in a crash. This commit fixes that crash.

* Removing the autorelease and retain parts from the WKWebView instantiation.

* Changes so that we can remove the retain from the property declaration and depend only on manual retain and release of memory <Deep>
 2019-11-14 14:49:11 +08:00
coulsonwang facf78a22b add opengl header since Texture2D and Image will use opengl define (#20322) 
* add opengl header since Texture2D and Image will use opengl define

* update review
 2019-11-13 17:46:40 +08:00
minggo 3aa7a73df2
Sync 20303 (#20308) 
* fix infinite loop

* fix issue that touch event does not match
If click area ouside keyboard, then engine only receive touch begin event witouth touch end or touch cancled event.
 2019-11-08 11:03:12 +08:00
coulsonwang 292e4c3b4d fix effect test (#20286) 2019-11-06 16:25:30 +08:00
minggo afbf817ec0
fix testfiled issue on iOS13 (#20296) 2019-11-06 16:11:37 +08:00
minggo 0cbaec9f29
don't set glview transparent, it many cause afterimage (#20298) (#20299) 2019-11-06 16:10:16 +08:00
minggo 01ff6ddd66
delete useless files and clean codes (#20279) 2019-11-06 14:24:06 +08:00
minggo 5acc952a17
fix iOS build issue (#20292) 2019-11-05 15:23:54 +08:00
coulsonwang 8126cfafd5 add defualt ios deloyment target (#20282) 
* add defualt ios deloyment target
 2019-11-01 17:07:52 +08:00
minggo 29e50a8631
remove extern "C" from base/base64.h for avoiding base64 function symbols conflict at linking libraries. (#20276) (#20280) 2019-11-01 09:22:38 +08:00
minggo dddcdf3a87
Fixes so that in the web view we are able to navigate different links correctly <Deep> (#20266) (#20275) 2019-10-31 10:58:35 +08:00
coulsonwang 251eaa2033 fix crash due to iOS13 UIWindowScene (#20271) 2019-10-30 17:43:07 +08:00
coulsonwang d35a1dee45 fix crash due to iOS13 UIWindowScene 2019-10-30 13:55:52 +08:00
coulsonwang 4f486528cc fix walking boundary of 3D test in lua 2019-10-29 19:24:35 +08:00
minggo c17c0cd357
Merge pull request #20259 from Mee-gu/fixCrash 
fix crash
 2019-10-29 10:47:39 +08:00
coulsonwang 35b246939a update review 2019-10-28 18:11:17 +08:00
coulsonwang a0d7751510 rename to make function name more clear 2019-10-28 16:47:27 +08:00
coulsonwang eb23e1ffde needs update texture info 2019-10-28 16:05:05 +08:00
coulsonwang d9f8296498 update reivew 2019-10-28 15:05:17 +08:00
coulsonwang 2d42aa1d21 fix memory leak (#20258) 2019-10-28 15:04:03 +08:00
coulsonwang c85cfcb223 fix crash 2019-10-28 14:26:09 +08:00
minggo 7f796936ee
Revert "fix RotateTo animation when angle is bigger than 360 (#20009) (#20211)" (#20257) 
This reverts commit 8a64e6f983.
 2019-10-28 09:53:07 +08:00
coulsonwang 2501f53b9b add CameraTest (#20253) 
* nodeTest

* fix
 2019-10-25 18:22:35 +08:00
CocosRobot 8878303e22 [ci skip][AUTO]: updating luabinding & cocos_file.json automatically (#20252) 2019-10-25 17:20:01 +08:00
coulsonwang a09806f580 Fix todo (#20248) 2019-10-25 16:41:03 +08:00
minggo c9af873e2e
fix some warnings (#20247) 2019-10-25 16:40:30 +08:00
coulsonwang 6dbbb4cc0a remove the comment of enableRetina for mac (#20249) 2019-10-25 15:39:59 +08:00
minggo be038d9ffc
fix some warnings (#20236) 2019-10-25 09:27:54 +08:00
coulsonwang 4c3d7b49a3 remove deprecated setBlendFunc (#20244) 2019-10-25 09:27:32 +08:00
coulsonwang d7f2ae3a9f fix TODO (#20245) 2019-10-25 09:26:57 +08:00
minggo 8bf83dcf3a
Sync 20209 (#20233) 
* fix issue: TextField can not receive characters(non number or english… (#20209)
 2019-10-24 17:19:18 +08:00
minggo 1898d477ce
[ci skip]Release note (#20234) 
* update changelog

* update release note

* update version
 2019-10-24 14:34:48 +08:00
CocosRobot 8a191d5f6f [ci skip][AUTO]: updating luabinding & cocos_file.json automatically (#20230) 2019-10-23 15:06:43 +08:00
minggo 6b1e55f419
Remove experimental namespace (#20229) 2019-10-23 14:58:31 +08:00
Arnold 11a1f820e2 [v4] add unzip test code (#20219) 2019-10-22 13:47:07 +08:00
Andy Duplain 1a04787287 Rework CMake Xcode support. (#20205) 
- Build using C++17 by default.
- Simplified customization of Xcode project via cmake.
- Add documentation to demonstrate how to use the customization.

- NOTE: I believe we could compile with bitcode enabled if the box2d
        library was compiled using bitcode.
 2019-10-22 13:42:56 +08:00
minggo cbf3233b59
Rename cocos2d::MessageBox to cocos2d::ccMessageBox. (#20159) (#20218) 2019-10-17 14:28:35 +08:00
minggo e86f22940a
Remove tinyxml2 from CCSaxParser implement. (#20141) (#20217) 2019-10-17 11:14:28 +08:00
minggo c816d2967b
Fix include order for Win32. (#20216) 2019-10-17 11:14:15 +08:00
minggo d29adb3180
sync #19914 (#20215) 2019-10-17 11:14:04 +08:00
minggo fae3ef8e48
fix memory leak (#20110) (#20214) 2019-10-17 11:13:02 +08:00
minggo fafd16e949
refactor Quaternion class (#20031) (#20213) 
* remove redundant copy constructor and destructor
 2019-10-17 11:12:49 +08:00
minggo 99e984dde5
fix crash when plist filename hasn't suffix (#19999) (#20212) 2019-10-17 11:12:37 +08:00
minggo 24b04e561b
sync #20007 to v4 (#20210) 
* sync #20007 to v4

* Fixing a bug in Node::enumerateChildren (#20045)

This patch fixes an issue that if both // (recursive enumeration)
and .. (starting from parent node) are specified,
Node::enumerateChildren does not honor the latter and starts searching
from current node rather than parent node.
 2019-10-17 11:12:25 +08:00
minggo 8a64e6f983
fix RotateTo animation when angle is bigger than 360 (#20009) (#20211) 2019-10-16 16:31:35 +08:00
CocosRobot 40038020ba [ci skip][AUTO]: updating luabinding & cocos_file.json automatically (#20208) 2019-10-16 11:41:06 +08:00
Andy Duplain 0a227ef2d7 Don't use MTL_ pixelformat when building for iOS Simulator. (#20198) 2019-10-16 09:51:17 +08:00
CocosRobot bdf39670fd [ci skip][AUTO]: updating luabinding & cocos_file.json automatically (#20203) 2019-10-16 09:44:05 +08:00
coulsonwang 67ae2e756e fix ProgramState and Program performance (#20189) 
* fix ProgramState and Program performance

* fix review

* fix

* add autorelease
 2019-10-15 09:40:59 +08:00
coulsonwang 327407d59b fix full screen issue (#20202) 
need resize depth and stencil attachment texture as well.
 2019-10-15 09:38:51 +08:00
coulsonwang b553648a77 remove unused code (#20195) 2019-10-12 09:45:56 +08:00
coulsonwang 68aedd7ef0 revert error caused by fixC4244Warning (#20190) 2019-10-11 16:39:33 +08:00
coulsonwang a91091e93a fix triangle batch (#20185) 
* fix triangle batch
since it would be too expensive to check the uniforms, simplify enable batching for built-in program.

* enable user update the materialID
 2019-10-10 09:41:39 +08:00
coulsonwang c7020fbb5f fix C4244 warning (#20173) 2019-10-09 17:50:32 +08:00
coulsonwang 49a3b5b228 fix auto test fails (#20183) 
needs an integer position
 2019-10-08 15:06:47 +08:00
CocosRobot 4116371053 [ci skip][AUTO]: updating luabinding & cocos_file.json automatically (#20176) 2019-09-26 17:35:39 +08:00
rh101 4ac3f94774 V4 RenderTexture PMA flag fix (#20153) 
* This is to ensure the RenderTexture internal texture2D PMA flag is set to the correct value.
[CCSprite.cpp] Blending mode needs to be set based on the PMA flag of the texture if using Sprite::initWithTexture().

* [CCSprite.cpp] Removed redundant code related to blending mode and opacityModifyRGB when creating a sprite with a texture.
 2019-09-26 16:11:23 +08:00
coulsonwang 6de088ab98 fix C4244 warning (#20162) 
* fix C4244 warning

* fix warning C4244

* fix compile error
 2019-09-25 14:32:26 +08:00
minggo 77a47957a7
set software mode will slow down performance (#20155) 2019-09-24 14:29:14 +08:00
coulsonwang 9ee9917047 fix Physics3DDebugDrawer (#20160) 
Since drawing type is ARRAY, should use  instead.
 2019-09-24 14:28:44 +08:00
coulsonwang 03a4ddf764 fix warning (#20146) 
* fix warning
fix warning

* remove integer type constructor for Vec2
 2019-09-24 11:31:35 +08:00
minggo b3dba7b93e
Merge pull request #20131 from Mee-gu/checkMemoryLeak 
fix memory leak on metal app
 2019-09-20 14:37:02 +08:00
minggo 965ea379a7
Merge pull request #20139 from Mee-gu/fixWarning 
fix warning
 2019-09-20 14:36:36 +08:00
coulsonwang 0dbe3419d2 fix warning 
fix warning
 2019-09-20 11:20:07 +08:00
coulsonwang fb39795d27 fix warning 2019-09-19 18:43:31 +08:00
coulsonwang e9a33903f0 fix memory leak for metal app 2019-09-19 15:31:05 +08:00
coulsonwang c17417f3cb set the right position of uniform location 2019-09-17 17:15:16 +08:00
coulsonwang dc910efee7 fix uniformLocation 2019-09-17 15:09:44 +08:00
minggo f3b09563f8
Mac label v4 (#20125) 
* fix system font issue on macOS Catalina
 2019-09-17 13:35:19 +08:00
minggo 9df47ef6fd
use WKWebview instead (#20103) 
UIWebView is removed in iOS 13.
 2019-09-06 09:57:38 +08:00
Arnold eed319938d [lua tests] MaterialSystemTest update u_Time uniform (#20083) 2019-09-05 15:56:39 +08:00
coulsonwang 816289ccf5 fix clipping node issue (#20100) 
Children are not correctly clipped.
 2019-09-05 09:17:43 +08:00
minggo d1abfd8aa2
use AVPlayerController instead (#20099) 2019-09-04 20:45:51 +08:00
coulsonwang 5ab04a7001 set default color attachment format (#20073) 2019-09-04 10:07:31 +08:00
Arnold 55f6f6d6e7 [bugfix] Fileutils iOS isDirectory (#20079) 2019-09-04 10:03:38 +08:00
coulsonwang 4d04b64a3a add specific define for metal (#20084) 2019-09-04 09:58:40 +08:00
coulsonwang f97717265b fix shader header defines (#20077) 2019-09-04 09:56:28 +08:00
coulsonwang 48e0d7d3a6 resize metal drawable (#20074) 2019-08-31 20:10:32 +08:00
coulsonwang 73ad115702 fix FastTMXLayer (#20065) 2019-08-29 22:30:03 +08:00
coulsonwang 66c4892b22 fix attribute location (#20064) 2019-08-29 18:15:03 +08:00
coulsonwang de3f252794 generate project for cocos2d (#20056) 2019-08-26 10:01:50 +08:00
minggo 50df439e87
update changelog and version (#20053) 2019-08-21 10:45:45 +08:00
minggo 5e40f5e6a5
remove tiff (#20047) 2019-08-20 15:15:40 +08:00
coulsonwang 1e8f6d24ac fix render pipeline (#20041) 2019-08-19 10:12:00 +08:00
John 3c08471bab don't convert const char* to char* (#20039) 
* C++ forbids conversion from const char* string to char*, so we change
function signature from char* to const char* in lua basic conversion
functions.
 2019-08-16 15:29:49 +08:00
CocosRobot a8d07022d6 [ci skip][AUTO]: updating luabinding & cocos_file.json automatically (#20036) 2019-08-15 17:01:11 +08:00
coulsonwang c4e6ede197 move VertexLayout to ProgramState (#20029) 
* move VertexLayout to ProgramState

* fix lua
 2019-08-15 16:51:49 +08:00
minggo 8913c30fc0
fix compile warnings (#20028) 2019-08-13 18:19:32 +08:00
minggo 1444263612
remove app from recent apps when exit (#19961) (#20020) 2019-08-13 17:31:29 +08:00
minggo b606f2a79d
Fix divide by zero in ui::Slider (#19957) (#20019) 
* Added RenderTexture::saveToFileAsNonPMA() to save images without PMA.
Set the PMA parameter to true when calling initWithRawData() inside RenderTexture::newImage(), since textures are PMA.
Renamed Image::premultipliedAlpha() to Image::premultiplyAlpha() to better reflect it's action, and made it public.
Added Image::reversePremultipliedAlpha() to allow the reversing of the PMA.
Updated CCImage-ios.mm to set the correct bitmapInfo for PMA and non-PMA images before saving a file.
Updated RenderTextureTest::RenderTextureSave() to cater for non-PMA file saving.

* [CCImage-ios.mm] Fixed indentation.

* [UISlider.cpp] Divide by 0 error if _maxPercent is equal to 0, which is an allowed value.
 2019-08-13 17:29:31 +08:00
minggo ba2f9ac165
sync #19996 and #19972: refactor DrawNode (#20021) 
* sync #19996 and #19972: refactor DrawNode

* fix compiling error
 2019-08-13 17:28:53 +08:00
coulsonwang 935af58e1d remove arrays of vertex layout (#20023) 2019-08-13 13:58:16 +08:00
coulsonwang 23732ab889 remove arrays of vertex buffer (#20022) 2019-08-13 09:46:20 +08:00
coulsonwang 3c693c7fd9 fix crash issue when egl context lost (#20025) 2019-08-13 09:45:39 +08:00
CocosRobot 28bc31aac6 [ci skip][AUTO]: updating luabinding & cocos_file.json automatically (#20014) 2019-08-06 14:14:59 +08:00
coulsonwang 320b9b4e67 Feature/sprite optimized (#19998) 
Optimize sprite creation speed
 2019-08-06 09:37:49 +08:00
sgosztyla 0be2a1e80a Fixing memory leak. (#19993) 
Library should be released after calling "newLibraryWithSource".
 2019-07-30 15:51:38 +08:00
CocosRobot b758f626eb [ci skip][AUTO]: updating luabinding & cocos_file.json automatically (#19991) 2019-07-26 17:33:42 +08:00
rh101 e574e4984f Added support for saving non-premultiplied alpha images from RenderTexture. (#19990) 2019-07-26 17:09:00 +08:00
CocosRobot 17ee8f0082 [ci skip][AUTO]: updating luabinding & cocos_file.json automatically (#19987) 2019-07-25 14:28:26 +08:00
coulsonwang 5dd5d084b6 fix glfw3.3 no respond issue. (#19965) 2019-07-23 17:40:37 +08:00
coulsonwang e64f2af25b fix header define for shader. (#19934) 2019-07-22 10:45:41 +08:00
minggo 0d121d7913
remove void in function declaration (#19954) 2019-07-22 09:38:46 +08:00
minggo 7a6c115b2f
fix ZipUtils memory-malloc succ check error. (#19923) (#19953) 2019-07-22 09:38:28 +08:00
minggo 29ce64b123
Fix cocos2d-js issue: Font height was not getting calculated properly in iOS. (#19926) (#19952) 2019-07-22 09:38:15 +08:00
minggo c283d4b939
sync 19759: fix: FastTMXLayer does not reflect opacity and anchor point (#19950) 2019-07-22 09:38:01 +08:00
minggo c8d13184f8
sync 19893: fix Wformat warnings (#19949) 2019-07-22 09:37:48 +08:00
minggo b7a6b77789
fix memory leak in CCUserDefault (#19853) (#19947) 
fastSet makes the Data object managing a new memory area in
[bytes, bytes + size), but it doesn't releasing the old data
it managed. Failure to release the old data causes memory leak.

The default constructed Data manages null memory, so calling
fastSet on it is fine.

Because `Data ret = defaultValue;` malloc new memory, we might
have better performance without it.
 2019-07-22 09:37:21 +08:00
minggo 3e6b1ffe92
refactor AudioEngine-Linux (#19822) (#19946) 
* refactor AudioEngine and AudioEngine-linux

* map::erase() can handle case if key doesn't exist.

* use map::iterator when it has already obtained.

* mapChannelInfo[id].channel is nullptr befor resume(). Don't
dereference it.

* FMOD::System::release() calls close, so calling close before release
is not necessary.

* use std::map::insert properly.

* remove unnecessary null check on _audioEngineImpl

* add comment on nullptr dereference
 2019-07-22 09:37:07 +08:00
minggo 77a72052c8
sync 19811: android_allowBackup2 (#19945) 2019-07-22 09:36:51 +08:00
minggo 6e0c4872c5
refactor CCScene (#19767) (#19944) 
* refactor-CCScene

prefer in-class initialization

* in-class initialization of pointer to nullptr
 2019-07-22 09:36:38 +08:00
minggo 7cea351cec
sync 19756: refactor CCBundle3DData (#19942) 2019-07-22 09:36:24 +08:00
minggo b3424a535f
[Change] the CC_64BITS macro to 64-bit decision. (#19723) (#19941) 2019-07-22 09:36:10 +08:00
minggo 0427381e06
sync 19722: fix assign nullptr to std::string (#19940) 2019-07-22 09:35:57 +08:00
minggo a4fb692f36
fix for #19713 (#19714) (#19939) 
#19713
 2019-07-22 09:35:44 +08:00
minggo 956fd85401
sync 19661: Clear the scene stack in the expected order (#19935) 2019-07-19 16:53:20 +08:00
minggo 838c285696
sync 19655 (#19932) 2019-07-19 13:45:08 +08:00
minggo e47d6b664f
sync 19649 and fix conflict (#19931) 2019-07-19 13:43:20 +08:00
minggo ad54a24cf0
sync 19634 and fix conflict (#19930) 2019-07-19 11:57:11 +08:00
minggo e93d4cb1d6
fix outdated documentation [ci skip] (#19618) (#19929) 2019-07-19 10:19:13 +08:00
coulsonwang 7b7cf55efb remove vertex step mode (#19921) 2019-07-17 13:59:37 +08:00
coulsonwang cb07f599f8 add api comments (#19922) 2019-07-17 09:26:15 +08:00
coulsonwang 03ea495fd6 add API comments (#19919) 2019-07-16 10:01:23 +08:00
coulsonwang f0f9cf612c add api comments (#19916) 2019-07-15 09:28:38 +08:00
coulsonwang de8cf4c45b set default frameBufferOnly to false for ios (#19915) 2019-07-15 09:28:18 +08:00
coulsonwang b96c467318 fix stencil issue (#19910) 2019-07-10 09:56:55 +08:00
coulsonwang 77b1535a9d add api document (#19909) 2019-07-09 09:43:45 +08:00
coulsonwang a92ab26096 remove unUsed member (#19906) 2019-07-05 10:11:12 +08:00
coulsonwang f72dbd28d0 add copyright (#19903) 2019-07-04 17:47:24 +08:00
minggo 67d43ca591
Update CMakeLists.txt 2019-07-04 09:48:45 +08:00
Arnold 097a4a74dc [Lua] Export ccexp.AudioEngine on linux (#19898) 
* export ccexp.AudioEngine on linux

* revert auto bindings

* gen bindings
 2019-07-03 18:57:18 +08:00
minggo 96534de260
fix warnings (#19891) 2019-07-03 10:43:10 +08:00
Arnold 888cd9b159 fix lua (#19888) 2019-07-02 09:29:20 +08:00
Arnold 2eb4625cbc
regenerate (#19887) 2019-07-01 13:51:02 +08:00
coulsonwang 7f96375871 Feature/fix tile map (#19883) 2019-06-30 11:36:52 +08:00
minggo e0200eaa54
should unbind prebound attachments to avoid error on some android devcies (#19875) 2019-06-28 08:56:13 +08:00
coulsonwang e8839cefbe Feature/lua drawing node (#19863) 
* fix DrawInRect in lua

* fix

* rename
 2019-06-27 17:44:07 +08:00
Arnold 76edaa0993 [bugfix] fix TextureInfo copy constructor (#19865) 
* fix copy

* fix compile error

* Update cocos/renderer/backend/ProgramState.cpp
 2019-06-27 17:42:32 +08:00
Arnold 75ba0f91d1 add break statement (#19867) 2019-06-27 09:40:53 +08:00
coulsonwang bbc6a88c51 optimize the uniform buffer (#19845) 
* optimize the uniform buffer

* update review
 2019-06-26 10:26:49 +08:00
Arnold 3620633fd8 [lua] remove simulator code from template project (#19862) 
* update template'

* fix compile error
 2019-06-25 18:14:50 +08:00
Arnold abd7ffddc6 [lua] remove TODO in LuaBasicConversions.cpp (#19848) 
* remove todos

* merge
 2019-06-25 10:22:03 +08:00
Arnold a0e114a07f remove cc.SimpleAudioEngine (#19859) 2019-06-25 09:41:19 +08:00
coulsonwang ab749c69ec fix setBlendFunc (#19858) 2019-06-24 15:30:15 +08:00
coulsonwang 22e8a651d2 Feature/lua render texture test (#19827) 
* fix render texture test in lua

* remove unnecessary code

* fix CI compile error
 2019-06-18 22:45:14 -07:00
coulsonwang 1b6c3a7173 setFrameBufferOnly to false when necessary (#19843) 2019-06-18 18:05:22 -07:00
coulsonwang 2c5fc38297 add test case (#19830) 
* add test case

* comment meaningless test case
 2019-06-18 18:04:56 -07:00
coulsonwang 7a94e66a14 Feature/fix alpha test (#19824) 2019-06-18 00:25:26 -07:00
coulsonwang 7486fe89dc fix flip issue (#19831) 
* fix flip

* fix flip issue
 2019-06-18 00:20:29 -07:00
Arnold 7851f212bf Rename backend::Texture2D (#19821) 
* compile on windows

* compile on mac

* rename to Texture2DBackend

* compile on mac
 2019-06-12 00:01:15 -07:00
coulsonwang fef1752cfe fix TODO (#19793) 2019-06-11 23:58:07 -07:00
Arnold 3c93c3d3dd swap shader source arguments (#19823) 2019-06-11 23:54:15 -07:00
minggo 1273fb305d
Remove simple audio engine (#19802) 2019-06-11 18:23:16 -07:00
patricejiang 85b72ca88a
pollEvents in loop 2019-06-11 10:16:20 +08:00
minggo 261cf5b82a
Merge pull request #19810 from minggo/change-version 
change version to beta
 2019-06-09 18:31:11 -07:00
minggo 07959475de
Merge pull request #19808 from minggo/fix-warnings 
fix warnings
 2019-06-09 18:30:24 -07:00
minggo e1a10faa9c change version to beta 2019-06-06 18:16:55 +08:00
minggo 0a85432d02 remove unneeded codes 2019-06-06 18:00:45 +08:00
minggo d6cbaa44e0 fix warnings 2019-06-06 17:53:16 +08:00
Arnold 60deaa60ca run genbindings.py (#19805) 2019-06-06 02:49:33 -07:00
coulsonwang 9dc04bf228 remove opengl codes (#19797) 2019-06-05 02:58:33 -07:00
coulsonwang 9bea7a3255 fix crash when using compressed pixel format (#19794) 2019-06-04 18:30:16 -07:00
coulsonwang 655d0d3404 [TileMapTest] Depth write state setting should not depended on the depth test flag (#19792) 2019-06-04 03:09:47 -07:00
coulsonwang 59d5f97d30 fix compile error (#19788) 2019-06-03 19:52:16 -07:00
coulsonwang 7c29811c81 vertex shader does not need header define (#19785) 2019-06-03 19:43:19 -07:00
coulsonwang bf93892ec9 bind texture target (#19786) 2019-06-03 18:25:32 -07:00
coulsonwang 89ba801628 add compressed format for metal (#19762) 2019-06-03 03:34:28 -07:00
coulsonwang 10b2799051 Feature/fix mipmap issues (#19753) 
* fix mipmap

* fix mipmap issues

* remove unneeded code

* fix

* remove Texture2D::PixelFormat, add backend::PixelFormat

* fix lua compile error

* reset *.tps files

* fix compile error

* fix compile error
 2019-06-02 18:39:51 -07:00
coulsonwang a67f729610 fix drawNode (#19773) 2019-05-29 19:06:43 -07:00
coulsonwang 8faf4a758f get supported depthStencil pixel format (#19774) 2019-05-28 19:46:55 -07:00
coulsonwang 9b0d36c6a9 [Node::Light] fix no light effects on iPhone6 and iPhone6s (#19751) 
* [Node::Light] fix no light effects on iPhone6 and iPhone6s

* add TODO
 2019-05-27 22:59:37 -07:00
coulsonwang 000a5e124b fix location (#19764) 2019-05-27 19:14:55 -07:00
minggo 23a21ef298
Remove jsb related (#19729) 
* remove jsb related codes
* update 3rd party
 2019-05-24 00:00:51 -07:00