lywsvip/cocos-engine
1
0
Fork 0
mirror of https://github.com/cocos/cocos-engine.git synced 2026-09-07 00:02:53 +08:00
Code Issues Packages Projects Releases Wiki Activity
21,179 Commits 111 Branches 231 Tags
develop
Commit Graph

127 Commits

Author SHA1 Message Date
minggo
313c58fe33 Improve utils api doc (#13922) 2022-12-28 15:04:56 +08:00
pandamicro
afd22296b4 MIT license update and to new year 2023 (#13927) 
* Cpp MIT license update and to date
* TS MIT license update and to date
 2022-12-28 11:25:12 +08:00
James Chen
c7e60d2bcb Use swig to generate js bindings (#12410) 2022-08-16 10:48:12 +08:00
minggo
d40b8739bc Merge branch 'v3.6.0' into develop_merge_v3.6 2022-07-18 10:38:14 +08:00
mmyduckx
4fdf948d24 refactor downloaderTask API style (#11697) 2022-06-29 11:34:15 +08:00
James Chen
04a3732d8e [v3.6] Fix initial ref count for assets-manager. (#11325) 
The default value is 0 in v3.6, so need to addRef after new.
 2022-06-01 17:44:07 +08:00
minggo
271cc5cf23 Remove some format rule (#10919) 
* remove some rules
* format all codes with new format rule
 2022-05-04 13:09:24 +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
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
wangyuzhi233
760109ab79 fix VS2019 warning (#3531) 2021-05-19 16:36:16 +08:00
jiaxin.lai
d23e039d2c native physx (#3409) 2021-04-20 12:51:52 +08:00
minggo
d8824f8a11 fix coding style (#3371) 2021-04-02 09:55:12 +08:00
minggo
826babfa64 Format code (#3217) 2021-01-13 14:49:32 +08:00
kenshin
2ad036ba09 3d gfx 2 4 3 patch (#2984) 
* free AudioMix partial wake locks, and android device can enter power save

* fix audio engine crash, avoid update function reentrancy.

* fix hot update issue.

* avoid a NULL point crash when ScriptEngine::cleanup
 2020-11-06 18:03:49 +08:00
minggo
a7d7cc8b1f fix warnings (#2819) 2020-09-22 14:27:25 +08:00
minggo
b08407c501 remove CC/cc prefix for file names (#2728) 2020-08-28 15:23:29 +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
minggo
ac08833b56 remove CCPlatformDefine.h (#2565) 2020-06-15 16:00:27 +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
743f91a3a8 remove some unneed codes (#2182) 2020-02-25 18:33:41 +08:00
minggo
39f4b68302 V8 fix (#1816) 
* use ndk's stl

* update external version: update v8
 2019-08-30 17:24:54 +08:00
minggo
57fd102dd5 fix compling error on android x86 2019-07-26 11:34:57 +08:00
minggo
fbc69aebeb can build and run on android, but will crash 2019-07-12 10:36:21 +08:00
dreamtravel
79cb270254 remove AnySDK and Cocos Analytics, move both into Creator Service Panel (#1619) 
* 移除cocos-2dx-lite的依赖external中的AnySDK和Cocos Analytics，转移这两者的集成到Service in Creator项目 修改Runtime默认工程，清理模版工程对AnySDK和Cocos Analytics的依赖

* 修改iOS link 模版

* 修改cocos2s-x-lite的deps目标
 2018-12-07 17:32:44 +08:00
Jare Guo
ccd3c113b0 Merge branch 'v2.0-release' into v2.1-release 
# Conflicts:
#	extensions/anysdk/platform/android/src/org/cocos2dx/javascript/SDKWrapper.java
 2018-10-15 17:42:53 +08:00
wuzhiming
61db1068f8 add context getter for appActivity 2018-10-10 09:18:46 +08:00
Jare Guo
625aafbf34 Merge branch 'v2.0-release' into next 2018-07-31 17:27:40 +08:00
leda
ccb40bdeda move CCAsyncTaskPool from cocos/base into extensions folder (#1422) 
* move CCAsyncTaskPool path

* move CCAsyncTaskPool path for ios & mac project

* change header path

* adapt CCAsyncTaskPool path for win32

* divide win32 build object files into Debug and Release folder
 2018-07-26 10:11:55 +08:00
吴智明
bf72d76f14 add some support for facebook (#1402) 2018-07-24 13:38:35 +08:00
leda
b3b37cf457 Add AssetsManager to iOS & Mac & Android & win32 (#1405) 
* Add incomplete AssetsManager to iOS & Mac

* remove Android.mk refer on Xcode project config

* re-add assetmanager for android

* re-add assetmanager for win32 project config

* remove unused macro define for win32

* remove unused marco define COCOS2D_JAVASCRIPT

* added header include for assetsManager

* Add CCAsyncTaskPool

* Fix AssetsManager event trigger issue

* update win32 project config, added CCAsyncTaskPool

* add CCAsyncTaskPool to extensions Android.mk
 2018-07-23 17:50:04 +08:00
minggo
38948b3acc improve anysdk error log 2018-06-28 18:15:46 +08:00
minggo
5b8919ccdf merge develop branch 2018-06-27 17:27:04 +08:00
James Chen
4da873ecb8 Merge branch 'v1.8' into develop 
# Conflicts:
#	cocos/scripting/js-bindings/script/jsb_cocos2d.js
 2018-02-23 10:26:48 +08:00
James Chen
e033dc5509 Fixes AnySDK framework crash after restarting game. (#1120) 2018-02-23 10:21:17 +08:00
minggo
802e48080e New renderer (#1097) 
* build work on mac

* build ok on iOS

* fix compiling error on android

* fix android link error
 2018-02-08 10:40:29 +08:00
Jare Guo
d9bd3d763c update license (#1089) 
* updating license

* update license
 2018-02-01 15:20:01 +08:00
pandamicro
e9913fbf5a Delete old version files during hot update (#1006) 2017-11-30 11:08:25 +08:00
James Chen
d904232f95 Uses shorter module name (cocos2dx_internal_static -> cis) to avoid compilation errors on Windows system which has a limitation of 260 bytes for build path. (#979) 
Yep, probably, we could define `buildDir` variable in build.gradle, but let's investigate later.
 2017-11-12 09:16:54 +08:00
James Chen
f3f00d5b78 Registers correct function name for payForProduct. 2017-10-25 13:58:50 +08:00
James Chen
51d95b5732 Fixes anysdk test code crash. 2017-10-24 22:06:35 +08:00
Wang Nan
61d141629e Merge pull request #904 from 2youyou2/v1.6 
add missed anysdk file
 2017-10-17 00:59:48 -05:00
yinkaile
6bc3fa1464 add missed anysdk file 2017-10-16 16:31:56 +08:00
James Chen
a301199621 EventAssetsManagerEx needs to be allocated on heap since it's the subclass of cocos2d::Ref. 2017-10-13 13:39:18 +08:00
CocosRobot
2d01d405dd [AUTO][ci skip]: updating cocos2dx_files.json 2017-10-10 08:55:16 +00:00
James Chen
412574c670 Merge branch 'develop' of git://github.com/cocos-creator/cocos2d-x-lite into jsb2.0 
# Conflicts:
#	cocos/scripting/js-bindings/auto/jsb_cocos2dx_extension_auto.cpp
 2017-10-10 14:48:04 +08:00
2youyouo2
2405d0c917 remove unused extensions 2017-10-10 10:30:55 +08:00
James Chen
039b3d2642 Updates anysdk bindings. 2017-10-09 14:58:04 +08:00