浏览代码
Merge branch 'master' into feature/new-clouds
Merge branch 'master' into feature/new-clouds
# Conflicts: # Assets/Shaders/Vegetation/Vegetation.shadergraph # Assets/Shaders/Vegetation/VegetationDeformation.shadersubgraph # Packages/manifest.json # Packages/packages-lock.json # ProjectSettings/ProjectVersion.txt/feature-new-clouds
Andrem
4 年前
当前提交
5eb68dc3
共有 13 个文件被更改,包括 776 次插入 和 503 次删除
-
2Assets/Scripts/Editor/LodLightmapCopy.cs
-
6Assets/Scripts/GameSystem/DefaultVolume.cs
-
2Assets/Scripts/GameSystem/RaceManager.cs
-
4Assets/Scripts/GameSystem/AppSettings.cs
-
4Assets/Scripts/Utility/Utility.cs
-
553Assets/Shaders/Vegetation/Vegetation.shadergraph
-
624Assets/Shaders/Vegetation/VegetationDeformation.shadersubgraph
-
4Packages/com.verasl.water-system/Scripts/GerstnerWavesJobs.cs
-
4Packages/com.verasl.water-system/Scripts/Rendering/PlanarReflections.cs
-
18Packages/manifest.json
-
54Packages/packages-lock.json
-
4ProjectSettings/ProjectVersion.txt
-
0.gitmodules
553
Assets/Shaders/Vegetation/Vegetation.shadergraph
文件差异内容过多而无法显示
查看文件
文件差异内容过多而无法显示
查看文件
624
Assets/Shaders/Vegetation/VegetationDeformation.shadersubgraph
文件差异内容过多而无法显示
查看文件
文件差异内容过多而无法显示
查看文件
|
|||
m_EditorVersion: 2020.2.0f1 |
|||
m_EditorVersionWithRevision: 2020.2.0f1 (3721df5a8b28) |
|||
m_EditorVersion: 2020.3.9f1 |
|||
m_EditorVersionWithRevision: 2020.3.9f1 (108be757e447) |
撰写
预览
正在加载...
取消
保存
Reference in new issue