Commit Graph

49 Commits

Author SHA1 Message Date
minggo cc9664405a use c++ 17 (#11389)
* use c++ 17
2022-06-08 10:19:35 +08:00
timlyeee 80fb5bcd30 update simulator to x64 (#11054) 2022-05-13 16:24:23 +08:00
Cocos Robot bff1fbe17d [ci skip][AUTO]: Automated clang-format update: c7f0f9c103dd416e903eedda42bc1f3f9c5368cb (#10682) (#10717)
Co-authored-by: cocos-robot <cocos-robot@cocos.com>
2022-04-11 11:11:30 +08:00
minggo cd48cf7106 Replace CCASSERT with CC_ASSERT (#10682)
* replace CCASSERT with CC_ASSEERT
2022-04-10 16:03:46 +08:00
minggo 164d4ccc14 Rename Vector and Map (#10206)
* Vector -> RefVector
* Map -> RefMap
2022-03-02 09:56:38 +08:00
minggo aca0a1bccb Remove memory management (#10125)
* remove NedPooling

* remove Jealloc

* remove some macros

* move memory related macros into Memory.h

* delete MemTrack
2022-02-22 18:12:48 +08:00
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
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 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 2f994d1a2c add writable path to searchpath on Windows platform when reading config (#2980) 2020-11-05 13:42:34 +08:00
PP 72ec8be7cb update gen-simulator workflow (#2971) 2020-11-05 09:46:21 +08:00
PP d648d3252b fix simulator compiling (#2943)
* fix simulator compiling

* remove terminate app logic
2020-10-23 20:54:01 +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
江战 082f432d2a remove unused code / 3dgfx (#2487)
* remove \*.mk

* support Makefile

* update default template

* fix path

* fix field type

* link resource instead of copy

* update external

* fix travis

* fix ssize_t macro

* fix macro 2
2020-05-28 11:24:14 +08:00
minggo 1bb0c717d0 fix macro redefine warning of platform defination (#2099) 2020-01-20 15:12:49 +08:00
Knox ad58cdda5b update simulator devices config (#1675) 2019-02-01 10:31:04 +08: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
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 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
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
Jare Guo be4c60343a fix simulator error (#1357)
* fix windows sdk version of simulator

* gulp: remove update-simulator-script
2018-07-03 09:55:52 +08:00
PP 7e6ca8a445 change jsb.js load path (#1335) 2018-06-27 15:52:50 +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
leda 19552e0dd4 gen-simulator works on mac, but not full features (#1313)
* fix part of warnings

* avoid all compile errors

* remove part lua related

* remove useless comment

* add function to get glfwWindow

* improve comment

* correct group files at platform folder

* update gulp simulator script copy
2018-06-14 14:23:16 +08:00
Jare Guo d9bd3d763c update license (#1089)
* updating license

* update license
2018-02-01 15:20:01 +08:00
James Chen 632448d64b Removes COCOS2D_DEBUG definition in release mode. Adds APP_CFLAGS.
RuntimeJsImpl doesn't depend on COCOS_DEBUG macro.
Warning fix in bzero.
2017-10-11 14:11:41 +08:00
James Chen b4b07dbf99 Duplicated which will cause simulator compilation failed in release mode. (#833)
* Duplicated which will cause simulator compilation failed in release mode.
It comes from https://github.com/cocos-creator/cocos2d-x-lite/pull/700

* Simulator project fix for android.

* Updates cocos2d-console.
2017-09-20 22:08:42 -05:00
2youyouo2 a2d0955bed should use v140 for 15.0 VisualStudioVersion 2017-07-26 16:08:01 +08:00
pandamicro 869ee6c185 fix vs 2017 compilation issue with spidermonkey 2017-07-11 00:52:37 +08:00
pandamicro 9765d2d039 Fix win32 simulator issue 2017-07-10 14:26:50 +08:00
pandamicro 66897d4f3f Add back ide-support and fix compilation issues 2017-07-09 10:52:37 +08:00
pandamicro 99206af737 Remove useless module and preprocess macros 2017-07-04 16:35:17 +08:00
pandamicro 154e3cf863 Support windows Spidermonkey v52 2017-06-30 18:02:08 +08:00
2youyouo2 61c76e0d8b support vs 2017 2017-05-17 18:02:57 +08:00
2youyou2 8a60346382 fixed bzero error 2017-05-10 13:56:23 +08:00
zhangbin 4acadb9595 Update the version of rapid json. 2016-09-02 11:40:59 +08:00
minggo 835acc20c8 fix crash 2016-07-20 10:40:09 +08:00
minggo 5f74ad1981 revert correct search path 2016-07-20 10:23:05 +08:00
2youyouo2 47f7f34117 default support resize window in simulator desktop 2016-06-06 11:54:08 +08:00
2youyou2 5f83d4a2e3 update win32 config 2016-04-14 11:46:16 +08:00
2youyouo2 6ca97fef49 add simulator 2016-04-13 16:43:49 +08:00