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
S
Description
No description provided
MIT 361 MiB
Languages
C++ 50.7%
TypeScript 35.1%
JavaScript 4%
C 4%
Objective-C++ 1.7%
Other 4.4%