浏览代码

Merge branch '2019.3/marc' into mikesbranch

# Conflicts:
#	Assets/scenes/Artist tools demo.unity.meta
/demo-artist_tools
Mike Geig 5 年前
当前提交
6d821478
共有 2 个文件被更改,包括 959 次插入20 次删除
  1. 977
      Assets/scenes/main_menu.unity
  2. 2
      Packages/manifest.json

977
Assets/scenes/main_menu.unity
文件差异内容过多而无法显示
查看文件

2
Packages/manifest.json


"com.unity.build-report-inspector": "0.1.2-preview",
"com.unity.burst": "1.2.3",
"com.unity.cinemachine": "2.5.0",
"com.unity.formats.fbx": "3.0.1-preview.2",
"com.unity.probuilder": "4.2.3",
"com.unity.recorder": "2.1.0-preview.1",
"com.unity.render-pipelines.universal": "7.1.8",
"com.unity.terrain-tools": "2.0.2-preview",

正在加载...
取消
保存