15 Commits

Author SHA1 Message Date
minggo
d40b8739bc Merge branch 'v3.6.0' into develop_merge_v3.6 2022-07-18 10:38:14 +08:00
minggo
3e818c45c9 Change macro name (#11528)
* CC_PLATFORM_MAC_IOS -> CC_PLATFORM_IOS

* CC_PLATFORM_MAC_OSX -> CC_PLATFORM_MACOS

* add codes to keep compatible
2022-06-16 14:05:16 +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
江战
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
1bb0c717d0 fix macro redefine warning of platform defination (#2099) 2020-01-20 15:12:49 +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
Jare Guo
d9bd3d763c update license (#1089)
* updating license

* update license
2018-02-01 15:20:01 +08:00
pandamicro
66897d4f3f Add back ide-support and fix compilation issues 2017-07-09 10:52:37 +08:00
zhangbin
4acadb9595 Update the version of rapid json. 2016-09-02 11:40:59 +08:00
minggo
5f74ad1981 revert correct search path 2016-07-20 10:23:05 +08:00
2youyouo2
6ca97fef49 add simulator 2016-04-13 16:43:49 +08:00