Commit Graph

121 Commits

Author SHA1 Message Date
mmyduckx 75c9e6a43b remove cocos2d-x network deprecated code (#10647) 2022-04-06 10:25:49 +08:00
江战 f1e60342e3 fix websocket send string (#10495) 2022-03-25 15:20:49 +08:00
江战 cb0618f0d4 3.5 Android: okhttp impl websockets (#10384) 2022-03-21 09:46:49 +08:00
minggo f08555248f fix conflict 2022-01-24 17:23:03 +08:00
Yun Hsiao Wu 14a17c9d22 license upgrade (#4210) 2022-01-24 17:18:47 +08:00
minggo ac7418f1c1 fix conflict 2021-11-30 10:48:30 +08:00
qiuguohua 063a79df84 Sync v3.4 to develop (#270)
* [ci] compile ios verbose (#3978)

* [v3.4.0] [ci] compile ios verbose (#3974

* Merge the code of v3.3.1 platform adaptation layer into the development branch (#3958)

* 1、Merge platform adaptation layer code into the development branch
2、It passed the test in windows and ohos system

* 1、Merge platform adaptation layer code into the development branch
2、It passed the test in windows and ohos system

* 1、Fix github compile windows error

* 1、Fix github compile windows error

* 1. Adjust the code format;
2. Fix js automatic generation binding
3. Adjust github CI compilation

* 1. Adjust the code format;
2. Fix js automatic generation binding
3. Adjust github CI compilation

* Solve mac and ios compilation failure

* Fix the problem of compilation of Windows-side simulator

* 1. Adapt the simulator to a new adaptation layer;
2. Fix the compilation warning of ios, and the implicit conversion failed;
3. Fix the mac compilation error, due to the problem of adding the link identification -all_load;

* 1.Add the isDisplayStats and setDisplayStats method to the screen interface

* Fix clang-tidy compilation warning

* Fix clang-tidy compilation warning

* Repair the emulator, compatible with mac and win

* 1、Repair detailed errors, including name modification and calling method modification
2、Delete redundant files in the template directory
3、Change the vibrate interface to vibrator
4、Fix word spelling errors

* Rename interfaces to modules

* Replace CC_ASSERT with CCASSERT

* Replace CC_ASSERT with CCASSERT

Co-authored-by: qiuguohua <>

* Remove all_flag in IOS (#4014)

* gfx: onAcquire callback (#4038)

* Solve the conflict between cocos/platform and template

Co-authored-by: minggo <nudtzxm@gmail.com>
Co-authored-by: 江战 <40414978+PatriceJiang@users.noreply.github.com>
Co-authored-by: Yun Hsiao Wu <yunhsiaow@gmail.com>
2021-11-30 10:13:49 +08:00
oahcy 5379e6ef35 引擎适配linux平台 (#4035) 2021-11-29 17:17:15 +08:00
timlyeee c7efe4e668 Using self defined function to replace strdup (#4046) 2021-11-17 10:27:12 +08:00
timlyeee c38c8255b6 sync push (#4034) 2021-11-05 13:32:54 +08:00
qiuguohua eeb9d5c689 Merge the code of v3.3.1 platform adaptation layer into the development branch (#3958)
* 1、Merge platform adaptation layer code into the development branch
2、It passed the test in windows and ohos system

* 1、Merge platform adaptation layer code into the development branch
2、It passed the test in windows and ohos system

* 1、Fix github compile windows error

* 1、Fix github compile windows error

* 1. Adjust the code format;
2. Fix js automatic generation binding
3. Adjust github CI compilation

* 1. Adjust the code format;
2. Fix js automatic generation binding
3. Adjust github CI compilation

* Solve mac and ios compilation failure

* Fix the problem of compilation of Windows-side simulator

* 1. Adapt the simulator to a new adaptation layer;
2. Fix the compilation warning of ios, and the implicit conversion failed;
3. Fix the mac compilation error, due to the problem of adding the link identification -all_load;

* 1.Add the isDisplayStats and setDisplayStats method to the screen interface

* Fix clang-tidy compilation warning

* Fix clang-tidy compilation warning

* Repair the emulator, compatible with mac and win

* 1、Repair detailed errors, including name modification and calling method modification
2、Delete redundant files in the template directory
3、Change the vibrate interface to vibrator
4、Fix word spelling errors

* Rename interfaces to modules

* Replace CC_ASSERT with CCASSERT

* Replace CC_ASSERT with CCASSERT

Co-authored-by: qiuguohua <>
2021-10-27 10:51:02 +08:00
江战 5074a5a826 V3.4.0 usec++14 (#3898)
This reverts commit fff4cc8fc94fb9b1a8424a2b89e9966184c6c4ce.
2021-09-18 13:53:58 +08:00
江战 9d264d289d fix ws crash (#3869) 2021-09-07 09:58:23 +08:00
江战 64666cc52a [bugfix] fix deadlock cocos-creator/3d-tasks#8736 (#3845) 2021-08-21 14:57:41 +08:00
江战 2253ac3a48 3.3 windows template merge (#3718) 2021-07-16 11:17:17 +08:00
Yun Hsiao Wu 5c88f24b3f misc gfx & fg improvements (#3703) 2021-07-13 14:07:47 +08:00
江战 1b02d913d1 3.3 fix android polling interval (#3694) 2021-07-12 09:57:19 +08:00
minggo 83fefb7710 Sync #3603 (#3651):Fix js string lose \0 2021-06-25 10:39:39 +08:00
江战 a652715f5a Harmony OS support - dont merge (#3528) 2021-05-21 10:43:22 +08:00
江战 d4ad5e0e4b fix dead lock (#3469) 2021-04-25 18:28:26 +08:00
minggo 46a455aa84 Merge v301 (#3395)
* [3.0.1] fix websocket crash (#3344)
* add lock
* use std::recursive_mutex (#3374)
2021-04-15 09:45:59 +08:00
minggo d8824f8a11 fix coding style (#3371) 2021-04-02 09:55:12 +08:00
江战 fe6da4a1d2 [sync] Travis compile vulkan (#3343) 2021-03-25 13:48:03 +08:00
Yun Hsiao Wu e0fdfef054 license upgrader 2021-02-05 14:08:22 +08:00
minggo 826babfa64 Format code (#3217) 2021-01-13 14:49:32 +08:00
zhefeng.zhang cc66959920 sync-pr3093 (#3158) 2020-12-30 20:28:18 +08:00
江战 518b56df5d [3.0] [jsb] some improvements (#3146) 2020-12-28 18:50:31 +08:00
江战 1892c43901 [3d-gfx] JSB convert types with template functions (#3100) 2020-12-09 16:35:51 +08:00
江战 ded9f64739 [3d-gfx] [bugfix] Android downloader JNI argument GC (#3087) 2020-11-30 16:09:43 +08:00
吴智明 4dc6a9f67c change android package name (#3006) 2020-11-11 10:55:10 +08:00
江战 eab43d947b [3dgfx] sync #1921 websocket server impl (#2859)
* support websocket server  (#1921)

* add websocket server

* disable websocket server
2020-09-29 11:06:11 +08:00
江战 316558908e reduce poll time (#2353) (#2853) 2020-09-28 14:58:32 +08:00
江战 8f15489435 fix crash (#2338) (#2851) 2020-09-28 14:53:51 +08:00
江战 382f0859f2 [bugfix] fix websocket crash on android 64 (#2844)
ASAN report error on android 64 devices
2020-09-28 10:35:09 +08:00
minggo b08407c501 remove CC/cc prefix for file names (#2728) 2020-08-28 15:23:29 +08:00
minggo 4d889c7ae7 use CC_DEBUG instead (#2718) 2020-08-25 11:58:13 +08:00
minggo 7efee066fd Remove duplicate (#2597) 2020-06-19 11:07:21 +08:00
minggo d381a16142 change namespace from cocos2d to cc (#2572) 2020-06-16 14:34:46 +08:00
江战 4c2b647bba remove CCPlatformConfig.h / 3d-gfx (#2555) 2020-06-12 11:17:37 +08:00
Arnold ce1cd53386 [gfx] win32 adaptation (#2270)
* update for windows

* update ref location

* update external

* revert debug info

* fix include order

* fix template

* fix buffer

* remove CCStdC-win32*
2020-03-18 11:35:40 +08:00
minggo e2728a7faa Android issue (#2209)
* fix android compile error

* fix android crash
2020-02-28 10:53:11 +08:00
minggo fb9c122827 Remove unneeded code (#2193)
* rmove unneeded codes

* fix compiling error

* remove unneeded file

* remove CCStdc related files
2020-02-26 16:11:32 +08:00
minggo 7ac05e123f remove unneed codes (#2180) 2020-02-25 16:04:18 +08:00
minggo adb387ada5 remove unneeded codes and fix jni implementation (#2154) 2020-02-20 12:03:14 +08:00
minggo 1bb0c717d0 fix macro redefine warning of platform defination (#2099) 2020-01-20 15:12:49 +08:00
Arnold 5502000bc6 prevent downloader callbacks when app exits (#1763) 2019-06-04 02:21:04 -07:00
Arnold d88d4ffead Use smart pointers to hold references of global Application::_scheduler (#1732)
* use std::weak_ptr

* revert build/libcocos2d.vcxproj

* fix mac & ios & android

* declare variable in if block

* revert build/libcocos2d.vcxproj
2019-04-25 18:43:01 +08:00
id-ilych 9303638190 WsThreadHelper::__defaultProtocols are not zeroed properly (#1723) 2019-04-19 10:54:27 +08:00
吴智明 2f6b44a2fc Change network module (#1655)
* change USE_NET_WORK to USE_SOCKET  and add xmlhttprequest default for ios platform

* change USE_NET_WORK to USE_SOCKET  and add xmlhttprequest default for android platform
2019-01-14 16:26:32 +08:00
Arnold 951869f9b9 [jsb] XMLHttpRequest & WebSocket API standardize (#1557)
* xmlhttprequest statusText exclude numeric code

* websocket bufferedBytes

* websocket extensions attribute

* add websocket close arguments

* responseXML

* fix ios compile

* responseType document

* getExtensions

* rollback change for responseXML

* fix arg 1005

* use const_cast instead of create tmp value
2018-10-23 11:57:23 +08:00