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 |
|
Yun Hsiao Wu
|
78f33fe31b
|
fix conflicts
|
2021-02-05 11:45:37 +08:00 |
|
cary
|
e0cb168c13
|
Fix render error of spine scene on native. (#8259)
|
2021-02-05 11:41:59 +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
|
bc030766fd
|
gfx: pipeline barriers
|
2021-02-03 17:52:31 +08:00 |
|
Yun Hsiao Wu
|
5a02d3f1d0
|
structure
|
2021-02-03 17:51:22 +08:00 |
|
Yun Hsiao Wu
|
4fd693adf2
|
device layer adapt
|
2021-02-03 17:51:20 +08:00 |
|
Yun Hsiao Wu
|
d9ca07d597
|
flush commands adapt
|
2021-02-03 17:48:03 +08:00 |
|
Yun Hsiao Wu
|
b216ad14d4
|
device agent adapt
|
2021-02-03 17:48:03 +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 |
|
李学武
|
1a046e45ff
|
Update rect.ts (#8247)
|
2021-02-03 15:03:11 +08:00 |
|
ChiaNing
|
bb9125e07f
|
Change component menu (#8249)
* Change component menu
* update
|
2021-02-03 11:11:42 +08:00 |
|
lawrence-liuyue
|
5fc7a37cd1
|
Hw deferred pipeline (#3179)
|
2021-02-02 22:16:53 +08:00 |
|
lawrence-liuyue
|
2e2cf5752f
|
Hw deferred pipeline (#8078)
|
2021-02-02 22:14:39 +08:00 |
|
minggo
|
8a73c95a03
|
remove BufferFlagBit.BAKUP_BUFFER (#8248)
|
2021-02-02 15:57:48 +08:00 |
|
Zeqiang Li
|
d0c7652e32
|
revert logic of loadop (#3276)
|
2021-02-02 11:41:04 +08:00 |
|
cary
|
f590d100d3
|
fix camera render on native (#8243)
|
2021-02-02 11:27:35 +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 |
|
ChiaNing
|
eefdf85360
|
lebel destory bug fix (#8244)
|
2021-01-30 12:48:38 +08:00 |
|
minggo
|
138b0224b8
|
Merge pull request #3268 from minggo/merge_3.0
Merge 3.0
|
2021-01-30 11:21:16 +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 |
|
ChiaNing
|
6db3a47de2
|
fix baidu & wechat checkPackable function (#8238)
* fix baidu & wechat checkPackable function
* add notice
|
2021-01-28 17:33:03 +08:00 |
|
Santy-Wang
|
88199d77c9
|
refine runtime log (#8239)
|
2021-01-28 17:29:54 +08:00 |
|
Zhang Visper
|
4b29e5cbd6
|
fix typo in README (#8237)
|
2021-01-28 16:51:32 +08:00 |
|
ChiaNing
|
042360f374
|
fix findcamera bug (#8236)
|
2021-01-28 16:44:22 +08:00 |
|
Yun Hsiao Wu
|
1c1406eab6
|
vk: more synchronization fixes (#3263)
|
2021-01-28 16:38:18 +08:00 |
|
troublemaker52025
|
2f325e336d
|
Optimize the shader acquisition of planar shadows (#8234)
* Optimize the shader acquisition of planar shadows
* update memeory-pool
|
2021-01-28 16:36:41 +08:00 |
|
江战
|
0e4689a6f7
|
Update config.json (#3260)
|
2021-01-28 16:05:26 +08:00 |
|
mmyduckx
|
910c6233cb
|
move dragonbones lib files to npm (#8232)
* move dragonbones lib files to npm
* mend
* update package-lock.json
* Fix CI
Co-authored-by: SB <leslieleigh@outlook.com>
|
2021-01-28 15:39:35 +08:00 |
|
江战
|
13cfab0ac3
|
fix gen (#3261)
|
2021-01-28 15:27:15 +08:00 |
|
jiaxin.lai
|
a35806bffd
|
support get bounds in physx (#8230)
* support get worldBounds/Bouding Sphere
* tweaks
* update @cocos/physx to 1.0.1
* update @cocos/physx to 1.0.2
|
2021-01-28 15:21:05 +08:00 |
|
cary
|
842aeb86c1
|
Fix the render error of particle trail on metal. (#8233)
|
2021-01-28 15:18:16 +08:00 |
|
PP
|
7b2ef5d882
|
remove header cocos2d-x.h on win32 (#3259)
|
2021-01-28 15:02:19 +08:00 |
|
PP
|
2a2d89b369
|
update package lock (#8231)
|
2021-01-28 14:47:04 +08:00 |
|
PP
|
ce5066be6b
|
Revert "Update package.json (#8228)" (#8229)
This reverts commit c81b531e3e.
|
2021-01-28 14:28:05 +08:00 |
|
Leslie Leigh (李的序)
|
c81b531e3e
|
Update package.json (#8228)
|
2021-01-28 14:06:13 +08:00 |
|