27 Commits

Author SHA1 Message Date
minggo
313c58fe33 Improve utils api doc (#13922) 2022-12-28 15:04:56 +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
santy-wang
91c884362d Merge branch 'v3.6.2' of github.com:cocos-creator/engine into v3.6.1-sync 2022-10-11 20:12:14 +08:00
oahc09
c2d6d7fc53 fix:WebSocket connection to 'ws://XXXX/' failed: A server must not mask any frames that it sends to the client. (#12882) 2022-09-27 17:45:56 +08:00
oahc09
170c0f39e7 fix:CC_ASSERT(!_currentApp.expired()); (#12844)
application has destroyed when WebSocketServer process callback in game thread
2022-09-26 11:00:32 +08:00
mmyduckx
b44a2ba4a0 refactor wescocketServer API from ondata to onmessage (#12540) 2022-08-25 11:33:16 +08:00
mmyduckx
24a35ba251 ios websocketServer support (#12467) 2022-08-23 14:05:47 +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
8e7669bf92 replace assert with CC_ASSERT (#10913)
* replace assert with CC_ASSERT
2022-04-29 10:18:41 +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
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
minggo
ee5636c573 Replace map with unordered_map (#10501)
* replace ccstd::map with ccstd::unordered_map
2022-03-28 11:49:17 +08:00
Cocos Robot
8a0f870a18 [ci skip][AUTO]: Automated clang-format update: 5ce68bff8e (#10474) (#10488)
Co-authored-by: cocos-robot <cocos-robot@cocos.com>
2022-03-25 11:06:01 +08:00
minggo
ecbc619e4b remove unneeded macros (#10474)
* remove unneeded macros
* add cc_ for some macros
2022-03-25 11:01:48 +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
4ef2fdea21 repalce std::map with ccstd::map (#10442) 2022-03-22 18:05:31 +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
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
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
minggo
d8824f8a11 fix coding style (#3371) 2021-04-02 09:55:12 +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
江战
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