minggo
|
f08555248f
|
fix conflict
|
2022-01-24 17:23:03 +08:00 |
|
Yun Hsiao Wu
|
14a17c9d22
|
license upgrade (#4210)
|
2022-01-24 17:18:47 +08:00 |
|
Yun Hsiao Wu
|
e0fdfef054
|
license upgrader
|
2021-02-05 14:08:22 +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 |
|
minggo
|
826babfa64
|
Format code (#3217)
|
2021-01-13 14:49:32 +08:00 |
|
pandamicro
|
9eb411fa20
|
Use NSView/UIView instead of MTKView
|
2021-01-11 17:12:44 +08:00 |
|
minggo
|
68360aefc9
|
iOS metal (#2932)
|
2020-10-30 16:15:47 +08:00 |
|
minggo
|
b08407c501
|
remove CC/cc prefix for file names (#2728)
|
2020-08-28 15:23:29 +08:00 |
|