Commit Graph

4804 Commits

Author SHA1 Message Date
Yun Hsiao Wu ea88ba33c6 codebase structure update (#3289)
* structure

* fix jsb auto binding license issue
2021-03-01 12:00:10 +08:00
Knox 0981eb7cbd improve video player seekTo in android (#3291)
* improve video player seekTo in android
2021-03-01 09:41:59 +08:00
Zeqiang Li 14d7126a46 Fix issue of uint index data type. (#3290) 2021-02-26 18:28:31 +08:00
Zeqiang Li 16e72fff9d revert logic of loadop (#3276) 2021-02-19 10:50:23 +08:00
mmyduckx 28838ba43d update LaunchScreenBackground.png from cocos 2dx to cocos creator (#3273) 2021-02-19 10:50:23 +08:00
Zeqiang Li 2f9525d4e5 fix rendering issue caused by depthattachment's StoreAction (#3272) 2021-02-19 10:50:23 +08:00
pandamicro 31e3642301 refactor presentCompleted to onPresentCompleted 2021-02-08 19:51:26 +08:00
pandamicro f1b27da2ef Fix compilation issues on iOS & mac 2021-02-08 19:48:28 +08:00
pandamicro eae4d1b82d Add GPU GC Pool clear while present completed 2021-02-08 12:40:56 +08:00
pandamicro 6ec439ba9f Fix merge issue 2021-02-08 11:14:02 +08:00
mmyduckx c80cd84bbd fix dragonbones resource import crash bug (#3286) 2021-02-07 11:15:03 +08:00
Yun Hsiao Wu a674efe2dc fix conflicts 2021-02-07 10:57:40 +08:00
Yun Hsiao Wu 0245a79df6 Merge remote-tracking branch 'mine/device-proof' into device-proof 2021-02-07 10:34:24 +08:00
Yun Hsiao Wu defdc8d5b0 Merge branch 'v3.1' of https://github.com/cocos-creator/engine-native into device-proof 2021-02-07 10:33:25 +08:00
Yun Hsiao Wu e381babfbe fix format 2021-02-05 20:21:52 +08:00
Yun Hsiao Wu d0fb6d5281 fix format 2021-02-05 16:41:01 +08:00
minggo 18d3aa40a7 fix merge error 2021-02-05 16:28:35 +08:00
Yun Hsiao Wu e0fdfef054 license upgrader 2021-02-05 14:08:22 +08:00
Yun Hsiao Wu 126ab62e03 misc fixes 2021-02-05 14:03:49 +08:00
minggo 28d170cd9e merge 3.0 2021-02-05 10:50:55 +08:00
minggo ed275a9721 remove BufferFlagBit.BAKUP_BUFFER (#3277) 2021-02-04 17:27:28 +08:00
Yun Hsiao Wu cae4a77261 fix conflicts 2021-02-03 17:46:26 +08:00
Yun Hsiao Wu 60969b42a4 Merge remote-tracking branch 'origin/v3.1' into device-proof 2021-02-03 17:25:33 +08:00
Yun Hsiao Wu 8c96bfa860 editor adapt 2021-02-03 16:38:40 +08:00
lawrence-liuyue 5fc7a37cd1 Hw deferred pipeline (#3179) 2021-02-02 22:16:53 +08:00
Zeqiang Li d0c7652e32 revert logic of loadop (#3276) 2021-02-02 11:41:04 +08:00
mmyduckx 89b5e0a297 update LaunchScreenBackground.png from cocos 2dx to cocos creator (#3273) 2021-02-01 18:49:14 +08:00
Zeqiang Li 32a7a48920 fix rendering issue caused by depthattachment's StoreAction (#3272) 2021-02-01 18:40:51 +08:00
Yun Hsiao Wu 6c9594864c gfx: define generator 2021-02-01 14:32:14 +08:00
minggo 2ee76cf1b1 Merge branch 'v3.0.0' into merge_3.0 2021-01-30 11:18:54 +08:00
江战 6205ce5967 change simulator arch (#3267) 2021-01-29 17:54:53 +08:00
江战 fe19da6d9f setup supported architectures for M1 (#3266) 2021-01-29 13:41:49 +08:00
pandamicro ae743ada83 Fix merge issues 2021-01-28 20:07:44 +08:00
pandamicro ec5401aed9 Merge remote-tracking branch 'origin/v3.1' into device-proof
# Conflicts:
#	CMakeLists.txt
#	cocos/cocos2d.h
#	cocos/platform/ios/Application-ios.mm
#	cocos/platform/ios/View.h
#	cocos/platform/mac/Application-mac.mm
#	cocos/renderer/core/gfx/GFXDevice.h
#	cocos/renderer/gfx-metal/MTLCommandBuffer.h
#	cocos/renderer/gfx-metal/MTLCommandBuffer.mm
#	cocos/renderer/gfx-metal/MTLContext.mm
#	cocos/renderer/gfx-metal/MTLDevice.h
#	cocos/renderer/gfx-metal/MTLDevice.mm
#	cocos/renderer/gfx-metal/MTLFence.h
#	cocos/renderer/gfx-metal/MTLFence.mm
#	cocos/renderer/gfx-metal/MTLQueue.h
#	cocos/renderer/gfx-metal/MTLQueue.mm
#	cocos/renderer/gfx-metal/MTLUtils.mm
#	cocos/renderer/gfx-vulkan/VKGPUObjects.h
#	templates/template-link/common/CMakeLists.txt
#	tools/tojs/metal.ini
2021-01-28 19:50:53 +08:00
Yun Hsiao Wu e267754df1 vk: restore gpu texture deletion (#3265) 2021-01-28 18:38:26 +08:00
minggo d9cb58f7d2 disable gl debug message (#3264) 2021-01-28 18:20:58 +08:00
Yun Hsiao Wu 1c1406eab6 vk: more synchronization fixes (#3263) 2021-01-28 16:38:18 +08:00
江战 0e4689a6f7 Update config.json (#3260) 2021-01-28 16:05:26 +08:00
江战 13cfab0ac3 fix gen (#3261) 2021-01-28 15:27:15 +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
troublemaker52025 121c2799ab 原生层接收subModel 创建的planar shader (#3255) 2021-01-27 19:06:06 +08:00
troublemaker52025 931b64a2c7 add clear shadow framebuffer method (#3247) 2021-01-27 19:05:51 +08:00
Yun Hsiao Wu 84d748db31 vk: fix synchronization issues (#3256) 2021-01-27 19:02:38 +08:00
kenshin fd94f6c1fd Handle touch event in SurfaceView, fix inconsistent touch area between Activity and View. (#3252) 2021-01-27 15:22:39 +08:00
minggo cf19c90f41 fix indirect draw logic (#3254) 2021-01-27 14:51:30 +08:00
Yun Hsiao Wu 785cc14c27 render pass accept array of access types 2021-01-27 14:13:39 +08:00
minggo 2f3e4e1108 fix compiling error if spine is not selected (#3250) 2021-01-27 11:53:42 +08:00
江战 b13ca8e4b8 fix missing file (#3251) 2021-01-27 11:53:29 +08:00
江战 c82a8f09e9 move files (#3253) 2021-01-27 11:52:39 +08:00