lywsvip/cocos-engine
1
0
Fork 0
mirror of https://github.com/cocos/cocos-engine.git synced 2026-09-07 00:02:53 +08:00
Code Issues Packages Projects Releases Wiki Activity
21,179 Commits 111 Branches 231 Tags
develop
Commit Graph

50 Commits

Author SHA1 Message Date
qiuguohua
e68506916c Develop branch adapts to openharmony (#14582) 2023-03-20 14:18:52 +08:00
pandamicro
afd22296b4 MIT license update and to new year 2023 (#13927) 
* Cpp MIT license update and to date
* TS MIT license update and to date
 2022-12-28 11:25:12 +08:00
江战
046a2b1378 Re-impl CC_ASSERT & CC_ASSERTF (#13588) 2022-12-05 17:12:30 +08:00
minggo
407438fa81 Merge branch 'v3.6.1' into merge_v3.6.1 2022-08-16 15:09:36 +08:00
mmyduckx
7aaa124458 Websocket onclose api consist with Web API (#12370) 
* make native websocket consistent with web API
 2022-08-10 17:15:17 +08:00
mmyduckx
3ab6917fb9 refine websocketClose parameters for protection (#12202) 
* refine websocketClose parameters for protection

* fix network manually close crash
 2022-07-28 09:37:12 +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
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
Cocos Robot
df50878b14 [ci skip][AUTO]: Automated clang-format update: 735860a2aa (#10560) (#10570) 
Co-authored-by: cocos-robot <cocos-robot@cocos.com>
 2022-03-29 16:40:20 +08:00
minggo
1a9d49e4c6 replace std::list/std::array with ccstd::list/ccstd::array (#10560) 
* replace std::list/std::array with ccstd::list/ccstd::array
 2022-03-29 16:36:53 +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
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
aca0a1bccb Remove memory management (#10125) 
* remove NedPooling

* remove Jealloc

* remove some macros

* move memory related macros into Memory.h

* delete MemTrack
 2022-02-22 18:12:48 +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
oahcy
5379e6ef35 引擎适配linux平台 (#4035) 2021-11-29 17:17:15 +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
江战
1b02d913d1 3.3 fix android polling interval (#3694) 2021-07-12 09:57:19 +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
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
江战
316558908e reduce poll time (#2353) (#2853) 2020-09-28 14:58:32 +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
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
1bb0c717d0 fix macro redefine warning of platform defination (#2099) 2020-01-20 15:12:49 +08:00
id-ilych
9303638190 WsThreadHelper::__defaultProtocols are not zeroed properly (#1723) 2019-04-19 10:54:27 +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
leda
19ab61b252 refine TODO & FIXME flag (#1450) 
* change TODO to REFINE

* change REFINE:cjh to REFINE

* change FIXME to IDEA

* improve format
 2018-08-10 12:52:00 +08:00
minggo
0d483a9b07 add back network (#1141) 
* add back network

* add network back on windows
 2018-03-09 16:20:48 +08:00
Jare Guo
d9bd3d763c update license (#1089) 
* updating license

* update license
 2018-02-01 15:20:01 +08:00
James Chen
08b38745a0 . -> , 2017-10-11 16:35:18 +08:00
James Chen
1764e440cd Comments code of listening EVENT_RESET in WebSocket-libwebsockets.cpp since it isn't needed for JSB. 
Minior fix: CCLOG -> LOGD in jsb_xmlhttprequest.cpp.
 2017-10-11 16:33:02 +08:00
James Chen
1a26f52b4c cleanup. 2017-08-08 16:18:48 +08:00
James Chen
06bdbf4560 Uses SocketRocket for iOS & macOS. 2017-07-20 17:49:32 +08:00