Commit Graph

16 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
PP
1bd1bf1c57 rename adapters (#11401)
* rename adapters

update

* update adapter require
2022-06-08 14:59:31 +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
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
江战
9d2a984777 remove header cocos2d.h (#3257) 2021-01-28 10:46:12 +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
江战
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
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
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
pandamicro
66897d4f3f Add back ide-support and fix compilation issues 2017-07-09 10:52:37 +08:00
2youyouo2
6ca97fef49 add simulator 2016-04-13 16:43:49 +08:00