Commit Graph

122 Commits

Author SHA1 Message Date
timlyeee 83734a835c Fix android and ohos load library bug (#4240) 2022-02-08 17:29:41 +08:00
timlyeee abd84ac0e1 rename cocos2d to cocos (#4158)
* Rename cocos2d to cocos
2022-02-08 14:27:42 +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
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
timlyeee ad048dff55 Change Windows Simulator from X86 to X64 (#3866)
* change simulator version from x86 to x64
* Fix some bugs for x64 version simulator
2021-09-07 09:58:52 +08:00
mmyduckx ae02dfc02e remove old icon format in cmake (#3856)
* remove icon in cmake

* add camke config for AppIcon
2021-09-01 15:20:02 +08:00
mmyduckx f049a58ae2 update icon for all platforms and Appsimulator (#3853) 2021-08-31 19:46:25 +08:00
minggo d261e62ecc merge v3.3.0 and fix conflict 2021-08-13 22:28:13 +08:00
timlyeee 8fa3d5b8d6 Fix simulator restart issue (#3814)
* Fix simulator restart issue
* fix conversion error
2021-08-10 13:52:02 +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
mmyduckx 7686705eeb remove jsb_module-register.cpp from native (#3776) 2021-08-05 16:14:53 +08:00
mmyduckx 9e9c1a2b3e Fix appSimulator crash when closing on mac (#3787) 2021-07-30 11:59:29 +08:00
Yun Hsiao Wu 1ebe420662 structure adjustments (#3532) 2021-06-02 09:39:13 +08:00
mmyduckx 76d15cafa4 send close event to JS (#3527) 2021-05-21 11:37:13 +08:00
jiaxin.lai d23e039d2c native physx (#3409) 2021-04-20 12:51:52 +08:00
PP c2d51e9507 fix simulator compiling on Win32 (#3397) 2021-04-14 15:39:38 +08:00
PP a9f42d9c1f fix simulator compiling (#3373) 2021-04-02 09:59:06 +08:00
PP 7b2ef5d882 remove header cocos2d-x.h on win32 (#3259) 2021-01-28 15:02:19 +08:00
江战 9d2a984777 remove header cocos2d.h (#3257) 2021-01-28 10:46:12 +08:00
PP e90d0957f3 support spine && dragonBone on simulator (#3171) 2020-12-30 20:02:08 +08:00
PP c2ac849d31 update config.json parsing && remove view menu for simulator (#3131)
* update config.json parsing

* remove setupUI

* synchronous change on win32 platform
2020-12-19 13:38:44 +08:00
PP 14f55649af support simulator waiting for debugger connect (#3125) 2020-12-18 10:19:03 +08:00
PP 55bf3c5e2e fix simulator unfocused (#3124)
* fix simulator unfocused
2020-12-17 21:11:28 +08:00
PP d03a29fc9c support window event on native desktop platform (#3058)
* support window event on Mac

* support window event on Win32
2020-11-24 09:59:58 +08:00
PP b52654268c fix bug on simulator (#3048)
* fix simulator window size

* fix crash when simulator exit
2020-11-19 16:14:08 +08:00
PP 7a18419046 update cmake target osx version (#3041) 2020-11-18 14:54:42 +08:00
PP 72ec8be7cb update gen-simulator workflow (#2971) 2020-11-05 09:46:21 +08:00
PP e8d56ecb6b enable debugger (#2969) 2020-11-02 09:49:29 +08:00
PP d648d3252b fix simulator compiling (#2943)
* fix simulator compiling

* remove terminate app logic
2020-10-23 20:54:01 +08:00
吴智明 c076ba8a7a change template config file to camel case syntax (#2804) 2020-10-10 11:55:22 +08:00
Knox 24bb96f7ef add video player (#2860) 2020-09-30 13:58:07 +08:00
minggo 9d9c79012b change file path (#2733) 2020-09-10 09:51:24 +08:00
minggo 4d889c7ae7 use CC_DEBUG instead (#2718) 2020-08-25 11:58:13 +08:00
江战 b96a725238 Update tools/simulator with CMake / 3dgfx (#2496)
* update mac simulator

* remove template files

* rm build/
2020-05-29 10:44:22 +08:00
minggo 1bb0c717d0 fix macro redefine warning of platform defination (#2099) 2020-01-20 15:12:49 +08:00
PP 0ab1197c27 refine pause playing audio when enter background (#1875)
* Revert "Pause music when app enter background (#1849)"

This reverts commit 7a24ee3377.

* refine pause playing audio when enter background
2019-10-12 17:02:50 +08:00
Arnold 7a24ee3377 Pause music when app enter background (#1849)
invoke AudioEngine::pauseAll when app enter background
2019-09-18 13:52:28 +08:00
masteage 969fb15300 ios build fail bug fix
+ https://github.com/cocos-creator/cocos2d-x-lite/issues/1735
2019-04-29 17:25:40 +09:00
leda c792623707 improve module register logic, include simulator config (#1665)
* add Configuration settings for simulator, too

* improve module register logic
2019-01-16 11:29:47 +08:00
leda 626e4a2344 fix simulator relaunch memory free bugs (#1646)
* improve terminate logic on Simulator

* fix win32 simulator relaunch, error
2018-12-27 16:04:27 +08:00
owen af028c94d3 fix simulator compile error (#1616) 2018-12-10 11:01:12 +08:00
leda beb45454ad support parse waitForConnect and debugPort from simulator/config.json (#1521)
* revert v8 debugger ip to 0.0.0.0 for simulator

* parse isWaitForConnect and debug port from config.json

* remove macro useless, since we parse the options from config.json
2018-09-26 18:57:56 -07:00
leda a5391aaabd add macro to support custom v8 debug option for creator (#1518)
* add macro to support custom v8 debug option for creator

* update console with version compare fixed

* revert debugger ip to 0.0.0.0 for template
2018-09-25 21:49:55 -07:00
leda 674614720e add v8 optional on macOS (#1515)
* add v8 libs into mac project

* update xcode simulator project config

* add v8 header into template

* add SCRIPT_ENGINE_V8 optional on macOS
2018-09-26 09:21:18 +08:00
Jare Guo bf7a01bdd5 Merge pull request #1508 from cocos-creator/v2.0-release
sync branch
2018-09-12 14:50:13 +08:00
leda 4ca166e109 dispatch show/hide event to js, included "cocos simulator" (#1500)
* add dispatchEnterBackgroundEvent for simulator

* more stable when set canvas size on win32

* add isNan check for float & double

* simplify event dispatch on AppDelegate
2018-09-06 16:39:45 +08:00
Jare Guo 548ae4380d Merge branch 'v2.0-release' into next 2018-08-16 14:05:09 +08:00
leda a7f266b9e8 resume View Menu for simulator on mac & win32 (#1456)
* start add menu back

* simulator resume works

* readded scale feature, fix exit bug

* free SetupUI, and fix compile only

* adapt to CustomEvent from struct to class

* resume show/hide FPS feature

* Revert "free SetupUI, and fix compile only"

This reverts commit fd8cf5ca0a17ba62ae5dec46fefea3b58c267c9d.

* Revert "Revert "free SetupUI, and fix compile only""

This reverts commit 6e5934a583db286508d00a61a22e11a3325090f1.

* correct EXIT logic

* scale works

* show/hide fps works

* remove unneed menu, replace tab with space

* remove debug output info

* no need _isShowFPS member

* fix NSError init error
2018-08-16 09:34:47 +08:00
Jare Guo 5701671310 Merge branch 'develop' into v2.0-release
# Conflicts:
#	README.md
#	cocos/2d/CCLabelTextFormatter.cpp
#	cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxEditBox.java
#	cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxEditBoxHelper.java
#	gulpfile.js
#	package.json
#	templates/js-template-binary/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj
2018-08-14 10:30:57 +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