Commit Graph

21 Commits

Author SHA1 Message Date
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
江战 a652715f5a Harmony OS support - dont merge (#3528) 2021-05-21 10:43:22 +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
吴智明 4dc6a9f67c change android package name (#3006) 2020-11-11 10:55:10 +08:00
minggo 9d9c79012b change file path (#2733) 2020-09-10 09:51:24 +08:00
minggo b08407c501 remove CC/cc prefix for file names (#2728) 2020-08-28 15:23:29 +08:00
江战 7423ccef65 Impl runOnGameThread on Android (#2577) 2020-06-24 15:31:25 +08:00
minggo d381a16142 change namespace from cocos2d to cc (#2572) 2020-06-16 14:34:46 +08:00
minggo 2d3010f546 Editbox (#2294)
* mac support editbox

* fix compiling/runtime issue for iOS/Android

* prevent handling touch event if it is prevented

* make editbox work

* fix effect of editbox on android
2020-03-19 13:46:31 +08:00
minggo adb387ada5 remove unneeded codes and fix jni implementation (#2154) 2020-02-20 12:03:14 +08:00
leda 6f18333fb3 free global g_textInputCallback before ScriptEngine clean up (#1575)
* Revert " fix editbox out of works after cc.game.restart (#1540)"

This reverts commit f539664522.

* free global g_textInputCallback before ScriptEngine clean up

* format beauty: tab -> space in editbox-android
2018-10-31 14:49:50 +08:00
leda f539664522 fix editbox out of works after cc.game.restart (#1540)
* fix editbox out of works after cc.game.restart

* same things on android & win32

* replace tab with space
2018-10-11 17:44:00 +08:00
W-MTZing 935a759cf4 rename c++ call java function by macro (#1468) 2018-08-22 14:07:17 +08:00
W-MTZing e284a0efd1 rename jni function by macro (#1467)
* rename jni function by macro

* modify JNI macro name
2018-08-22 09:21:35 +08:00
minggo 09060d3709 fix size issue and typo (#1328) 2018-06-25 18:23:43 +08:00
minggo 467b0346ce editbox support mac (#1322) 2018-06-21 09:25:56 +08:00
minggo 4ded383b8a fix crash of editbox on Android (#1273) 2018-05-30 14:51:56 +08:00
minggo 7235644283 Editbox support (#1270)
can work on Android
2018-05-28 17:09:57 +08:00