Commit Graph

25 Commits

Author SHA1 Message Date
mmyduckx
75c9e6a43b remove cocos2d-x network deprecated code (#10647) 2022-04-06 10:25: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
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
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
minggo
b08407c501 remove CC/cc prefix for file names (#2728) 2020-08-28 15:23:29 +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
1bb0c717d0 fix macro redefine warning of platform defination (#2099) 2020-01-20 15:12:49 +08: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
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
412f71a89b [android] Fixes wrong timeout value is used. Should use timeout parameter per requrest instead of per client instance. (#1014) 2017-11-28 13:42:01 +08:00
James Chen
53e07c1da7 Merge branch 'v1.6' of git://github.com/cocos-creator/cocos2d-x-lite into jsb2.0 2017-09-07 18:32:24 +08:00
James Chen
703e857352 Synchronize network changes from cocos2d-x. 2017-08-30 13:56:41 +08:00
James Chen
e86ed76abf jsb2.0 windows works on v8. 2017-08-09 18:06:33 +08:00
James Chen
18537b6a8a Updates project configuration for win32 and assert logic fix for HttpClient. 2017-02-16 11:13:31 +08:00
pandamicro
bcbc4e1131 Upgrade cocos/math & cocos/network to v3.13 2016-08-05 18:13:16 +08:00
Wenhai Lin
14d3fc1fdb Fixed crash 2016-05-20 11:52:13 +08:00
Wenhai Lin
d4481bfd5a Refine (#48) 2016-04-28 11:58:34 +08:00
Wenhai Lin
94c95d5838 Withespaces does matter. 2016-03-31 23:50:02 +08:00
Wenhai Lin
a6dbf31dcf cocos 2d lite version 2016-03-29 17:55:48 +08:00