Commit Graph

24 Commits

Author SHA1 Message Date
mmyduckx
9f64efb024 fix parser HttpRequestHeader (#12757)
* fix parser HttpRequestHeader
2022-09-14 15:29:33 +08:00
minggo
5778aab354 Merge branch 'v3.6.0' into merge_v3.6 2022-08-08 10:49:46 +08:00
James Chen
fc6ff454b9 Fix memory issues for XMLHttpRequest & WebSocket (#12271)
* Add missing addRef for Http relevant classes.

* Fix all XMLHttpRequest instances are leak.

* Fix unroot logic in jsb_websocket.cpp
2022-07-29 15:52:17 +08:00
mmyduckx
db6f517c13 fix HttpClient severe performance degradation by use threadPool in se… (#12240)
* fix HttpClient severe performance degradation by use threadPool in sendImmdiate

* use global threadPool

* move include file to cpp file
2022-07-28 15:46:22 +08:00
minggo
271cc5cf23 Remove some format rule (#10919)
* remove some rules
* format all codes with new format rule
2022-05-04 13:09:24 +08:00
minggo
84c27e7f71 Merge branch 'v3.5.0' into v3.6.0_merge_v3.5 2022-04-24 13:41:27 +08:00
minggo
444bfe31c4 Refactor CC_NEW/CC_DELETE (#10810)
* replace CC_NEW/CC_DELETE with ccnew/delete
2022-04-21 16:39:34 +08:00
minggo
cd48cf7106 Replace CCASSERT with CC_ASSERT (#10682)
* replace CCASSERT with CC_ASSEERT
2022-04-10 16:03:46 +08:00
mmyduckx
75c9e6a43b remove cocos2d-x network deprecated code (#10647) 2022-04-06 10:25:49 +08:00
Cocos Robot
a2df4e4dbd [ci skip][AUTO]: Automated clang-format update: 771de57fc2 (#10469) (#10472)
Co-authored-by: cocos-robot <cocos-robot@cocos.com>
2022-03-24 13:50:39 +08:00
minggo
7f4cb9e3b1 Remove string (#10469)
* replace std::string with ccstd::string
2022-03-24 11:53:10 +08:00
Cocos Robot
d3b752a2cd [ci skip][AUTO]: Automated clang-format update: e59d6899c7 (#10427) (#10441)
Co-authored-by: cocos-robot <cocos-robot@cocos.com>
2022-03-22 15:55:36 +08:00
minggo
2379892c02 Unify stl (#10427)
* replace std::deque and std::queue
* replace std::unordered_set
* replace std::queue, std::deque and std::unordered_set
2022-03-22 14:00:36 +08:00
Cocos Robot
24d84664f8 [ci skip][AUTO]: Automated clang-format update: 3de1584200 (#10402) (#10424)
Co-authored-by: cocos-robot <cocos-robot@cocos.com>
2022-03-21 16:04:49 +08:00
minggo
34bf14269c unify stl (#10402)
* add ccstd::vector
* replace cc::vector with ccstd::vector 
* replace std::vector with ccstd::vector
* do not include <vector>
2022-03-21 15:55:02 +08:00
minggo
7f24f34b22 Merge branch 'v3.5.0' into v3.6_merge_v3.5.0 2022-01-25 19:52:06 +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
5410a48a58 Implement more logic in native (#4131)
Co-authored-by: bofeng.song <bofeng.song@chukong-inc.com>
Co-authored-by: dumganhar <dumganhar@gmail.com>
Co-authored-by: mmyduckx <308303735@qq.com>
Co-authored-by: Patrice Jiang <397136899@qq.com>
Co-authored-by: 江战 <40414978+PatriceJiang@users.noreply.github.com>
2022-01-07 18:39:40 +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
timlyeee
c7efe4e668 Using self defined function to replace strdup (#4046) 2021-11-17 10:27:12 +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
江战
a652715f5a Harmony OS support - dont merge (#3528) 2021-05-21 10:43:22 +08:00