比较提交
此合并请求有变更与目标分支冲突。
/Packages/com.verasl.water-system/Shaders/WaterInput.hlsl
/Packages/com.verasl.water-system/Shaders/Water.shader
/Packages/com.verasl.water-system/Shaders/WaterCommon.hlsl
/Packages/com.verasl.water-system/Shaders/WaterLighting.hlsl
/Packages/com.verasl.water-system/Scripts/Rendering/WaterSystemFeature.cs
/Packages/com.verasl.water-system/Scripts/GerstnerWavesJobs.cs
/Packages/com.verasl.water-system/Scripts/Water.cs
/Packages/manifest.json
/Packages/packages-lock.json
/Assets/Data/UniversalRP/PipelineAsset_High.asset
/Assets/Data/UniversalRP/PipelineAsset_Low.asset
/Assets/Data/UniversalRP/BoatDemoRenderer.asset
/Assets/Shaders/Vegetation/Vegetation.shadergraph
/Assets/Shaders/Vegetation/VegetationDeformation.shadersubgraph
/Assets/AddressableAssetsData/AssetGroups/Utility.asset
/Assets/Scripts/GameSystem/RaceManager.cs
/Assets/Scripts/GameSystem/AppSettings.cs
/Assets/Scripts/GameSystem/InputControls.cs
/ProjectSettings/EditorBuildSettings.asset
/ProjectSettings/PackageManagerSettings.asset
/ProjectSettings/ProjectVersion.txt
/ProjectSettings/ProjectSettings.asset
/Assets/Scripts/Editor/LodLightmapCopy.cs
/Assets/Scripts/Utility/Utility.cs
/Assets/Scripts/Editor/Benchmark/BenchmarkWindow.cs
/UserSettings
/Assets/Scripts/GameSystem/DefaultVolume.cs
/Assets/AddressableAssetsData/AssetGroups/VolumeProfiles.asset
/Assets/Objects/misc/DefaultVolume.prefab
/.gitmodules
17 次代码提交
作者 | SHA1 | 提交日期 |
---|---|---|
Andre McGrail | 6238e07b | 3 年前 |
Andre McGrail | ea2f6612 | 3 年前 |
Andre McGrail | 49659ec8 | 3 年前 |
Andrem | 30408e83 | 3 年前 |
Andrem | 420497fe | 3 年前 |
André McGrail | 9563496c | 3 年前 |
Andre McGrail | 406d9439 | 3 年前 |
Andre McGrail | 485253b7 | 3 年前 |
André McGrail | f5f9d558 | 3 年前 |
André McGrail | cab9d8f3 | 4 年前 |
André McGrail | 8a080024 | 4 年前 |
André McGrail | 9d8a2598 | 4 年前 |
André McGrail | 219e8688 | 4 年前 |
André McGrail | e28561b1 | 4 年前 |
Andre McGrail | 01a887f2 | 4 年前 |
André McGrail | 6d11c41d | 4 年前 |
André McGrail | 990e2a21 | 4 年前 |
共有 266 个文件被更改,包括 7719 次插入 和 4900 次删除