Commit Graph

54 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
minggo 1552345596 Merge branch 'v3.4.2' into v3.5.0_merge_v3.4.2
Conflicts:
	cocos/platform/android/jni/JniCocosActivity.cpp
	cocos/platform/apple/JsbBridgeWrapper.mm
	cocos/platform/ohos/jni/JniCocosAbility.cpp
	cocos/renderer/gfx-metal/MTLCommandBuffer.mm
	external/config.json
2022-01-24 15:01:01 +08:00
kenshin a608d90577 copy from https://github.com/cocos-creator/engine-native/pull/4170 (#4185) 2022-01-17 19:37:11 +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
Yun Hsiao Wu 2056271bac misc pipeline fixes (#3811) 2021-08-10 09:49:18 +08:00
timlyeee b9ed0af4fa Fix glslang errors and Edit-box errors (#3802)
* Update cmake list for dynamic library update

* as glslang and tbb become dynamic library, the cmake should copy dll from glslang folder too.
* "gulp gen simulator" command will automatically generate by user's comupter so sometime it will generate x64 version's simulator. no it's update to  generate Win32 version
* Edit-Box was using wrong parameters GWL_WNDPROC, so x64 version will hit an error. details below:https://docs.microsoft.com/en-us/windows/win32/api/winuser/nf-winuser-setwindowlongptra

* small optimize gulp

* change config

* Update cmake list for dynamic library update

* as glslang and tbb become dynamic library, the cmake should copy dll from glslang folder too.
* "gulp gen simulator" command will automatically generate by user's comupter so sometime it will generate x64 version's simulator. no it's update to  generate Win32 version
* Edit-Box was using wrong parameters GWL_WNDPROC, so x64 version will hit an error. details below:https://docs.microsoft.com/en-us/windows/win32/api/winuser/nf-winuser-setwindowlongptra

* add glslang header

* Revert "Update cmake list for dynamic library update"

This reverts commit 5eceb132c2411d7e479f6744e33048fabaafe780.

* fix rebase error
2021-08-05 17:22:46 +08:00
timlyeee 723f871bcc update x64 external (#3727) 2021-07-16 11:47:30 +08:00
江战 a652715f5a Harmony OS support - dont merge (#3528) 2021-05-21 10:43:22 +08:00
minggo f6a0c82941 fix conflict 2021-03-15 17:24:16 +08:00
PP 49aa21c50c fix editbox multiline mode can't end editing (#3317) 2021-03-15 10:23:19 +08:00
PP e9963878ed fix editBox end editing by pressing return on Win32 / MacOS (#3295) 2021-03-05 11:17:34 +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
kenshin 0181a6842e sync https://github.com/cocos-creator/cocos2d-x-lite/pull/3101 (#3114) 2020-12-14 15:11:18 +08:00
PP f7b0546bff sync pr from 2d (#3062)
* fix editbox indicator jump to end on iOS

* support dispatchOrientationChangeEvent

* fix orientation when flip landscape on iOS device
2020-11-25 10:42:58 +08:00
吴智明 4dc6a9f67c change android package name (#3006) 2020-11-11 10:55:10 +08:00
PP_Pro 98af261687 fix editbox cannot complete on native native desktop platform 2020-11-09 15:31:27 +08:00
江战 346ff97f80 [bugfix] correct utf8 encoding (#2394) (#2846)
* add UTF8LooseFix

* fix include
2020-09-28 09:39:35 +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 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 79fc8353d1 3dgfx add CI & cmake (#2350)
* use-cmake

* revert: enable gles3 for android

* compile with cmake only
2020-04-14 13:58:45 +08:00
Arnold 4945e21a5e 3dgfx win32 refactor, move view-win32 to platform/win32/ (#2320)
* remove View-win32 in templates

* add View-win32.cpp/h

* fix template

* fix template, file path

* remove title
2020-03-23 18:15:54 +08:00
Arnold d3cf38e609 [3d-gfx] win32 fix editbox (#2302) 2020-03-19 14:42: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
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 adb387ada5 remove unneeded codes and fix jni implementation (#2154) 2020-02-20 12:03:14 +08:00
PP e869bc1b63 fix editBox background color in iOS13 (#1886) 2019-10-16 17:43:08 +08:00
PP a7d01f9279 init default color for editBox (#1866) 2019-10-09 13:44:02 +08:00
minggo d76a2cfdb8 adjust editbox size to adapter safe arear insets (#1848) 2019-09-18 10:07:52 +08:00
PP 2ff511ac8c fix composed character on EditBox (#1798) 2019-08-21 11:41:53 +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
minggo b642e0fcc7 Merge branch 'v2.0-release-rename' of github.com:cocos-creator/cocos2d-x-lite into merge-rename 2018-08-28 14:39:40 +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
leda 2943b4ccf8 fix keyboard location calc error (#1466) 2018-08-21 16:01:40 +08:00
leda d92f07a5be beauty the "done" confirm button of EditBox on iOS & Android (#1464)
* chose a better color match for editbox button

* show editbox confirm button name depend on system language

* correct wrong order

* not magic number for this special color

* another empty line for strings.xml

* adapt color for iOS EditBox

* add editbox i18 strings for iOS mac

* use i18n strings

* simplfy string key, move i18n string location

* simplify get i18 string logic

* add i18n strings to link template

* same changes on default-template

* short i18 key on android
2018-08-21 14:18:05 +08:00
leda 9df2e0dcfa fix EditBox input Chinese error on iOS (#1460)
* fix input error when using 9 Key to input chinese

* textFieldDidChange callback works

* correct markedTextRange condition error

* do same adapt on textView
2018-08-17 09:47:33 +08:00
minggo 73e0109366 editbox support on windows (#1331) 2018-06-27 11:21:32 +08:00
minggo 09060d3709 fix size issue and typo (#1328) 2018-06-25 18:23:43 +08:00
leda 113ef05feb fix win32 simulator compile/link error, no fix when running (#1326)
* update simulator win

* add libcocos2d depend for simulator

* compile and link success

* update simulator win, add part window control
2018-06-22 17:26:53 +08:00
leda 723f52a472 win32 link/default template compile and link pass, but not works when run (#1321)
* modify file changes on project config

* correct libcocos2d compile

* add win32 props back

* Revert "fix windows link template (#1138)"

This reverts commit 332d95e5b8.

* correct compile error

* many link errors need to be solved

* added part lack methods

* add empty impl for canvas rendering context 2d

* update main.cpp

* correct audio/network compile and link error

* sync win32 application logic with mac

* remove wrong change on application-win32

* correct win32 default-template compile and link error

* win32 simulator part compile error fixed

* editbox define changes
2018-06-22 10:19:31 +08:00
minggo ffdbdd44fb improve editbox on mac (#1324)
* support password
* support length limitation
* prevent enter key in single line mode
2018-06-21 16:14:53 +08:00
minggo 467b0346ce editbox support mac (#1322) 2018-06-21 09:25:56 +08:00
minggo 1b55dbdfd4 fix bug that keyboard type is not changed when using passward on iOS (#1315) 2018-06-15 14:07:33 +08:00