浏览代码
Merge branch 'master' into feature/new-clouds
Merge branch 'master' into feature/new-clouds
# Conflicts: # Assets/Data/UniversalRP/BoatDemoRenderer.asset # Assets/Data/UniversalRP/PlanarReflectionRenderer.asset/feature-new-clouds
André McGrail
4 年前
当前提交
937258d5
共有 224 个文件被更改,包括 4389 次插入 和 4527 次删除
-
12Assets/AddressableAssetsData/AssetGroups/Utility.asset
-
16Assets/AddressableAssetsData/AssetGroups/VolumeProfiles.asset
-
221Assets/Data/InputControls.inputactions
-
5Assets/Data/UniversalRP/BoatDemoRenderer.asset
-
2Assets/Data/UniversalRP/PipelineAsset_High.asset
-
2Assets/Data/UniversalRP/PipelineAsset_Low.asset
-
5Assets/Data/UniversalRP/PlanarReflectionRenderer.asset
-
2Assets/Data/Volumes/HighQuality.asset
-
6Assets/Data/Volumes/MediumQuality.asset
-
2Assets/Materials/BlackoutBackface.mat
-
2Assets/Materials/Blocker.mat
-
2Assets/Materials/BushTest.mat
-
2Assets/Materials/Seaweed.mat
-
2Assets/Materials/Splash.mat
-
37Assets/Materials/StudioLight.mat
-
37Assets/Materials/StudioLight_Bright.mat
-
2Assets/Materials/Terrain.mat
-
4Assets/NavMeshComponents/Editor/NavMeshAssetManager.cs
-
14Assets/Objects/Levels/Island/TerrainGroup.prefab
-
36Assets/Objects/UI/prefabs/LoadingScreen.prefab
-
519Assets/Objects/boats/Interceptor/Interceptor.fbx
-
27Assets/Objects/boats/Interceptor/MSLL.tif.meta
-
27Assets/Objects/boats/Interceptor/Normal.tif.meta
-
47Assets/Objects/boats/renegade/MSLL.tif.meta
-
27Assets/Objects/boats/renegade/Normal.tif.meta
-
29Assets/Objects/environment/Cliffs/Maps/Cave_defaultMat_AONormal.tif.meta
-
29Assets/Objects/environment/Cliffs/Maps/Cliff_Full_01_defaultMat_AONormal.tif.meta
-
25Assets/Objects/environment/Cliffs/Maps/Hero_defaultMat_AONormal.tif.meta
-
25Assets/Objects/environment/Cliffs/Maps/Rocks_defaultMat_AONormal.tif.meta
-
5Assets/Objects/environment/Cliffs/Materials/Env_Cliff_Full_01.mat
-
5Assets/Objects/environment/Cliffs/Materials/Env_Cliffs.mat
-
5Assets/Objects/environment/Cliffs/Materials/Env_HeroCave.mat
-
5Assets/Objects/environment/Cliffs/Materials/Env_HeroLarge.mat
-
5Assets/Objects/environment/Cliffs/Materials/Env_Rocks.mat
-
904Assets/Objects/environment/Cliffs/Meshes/Env_Cliff_Full_01.fbx
-
34Assets/Objects/environment/Cliffs/Prefabs/Cliff_Full_01.prefab
-
34Assets/Objects/environment/Cliffs/Prefabs/Cliff_Full_02.prefab
-
34Assets/Objects/environment/Cliffs/Prefabs/Cliff_Full_03.prefab
-
34Assets/Objects/environment/Cliffs/Prefabs/Cliff_Wall_01.prefab
-
25Assets/Objects/environment/Cliffs/Prefabs/Cliff_Wall_02.prefab
-
25Assets/Objects/environment/Cliffs/Prefabs/Cliff_Wall_03.prefab
-
33Assets/Objects/environment/Cliffs/Prefabs/Hero_Cave.prefab
-
34Assets/Objects/environment/Cliffs/Prefabs/Hero_CaveEntrance.prefab
-
33Assets/Objects/environment/Cliffs/Prefabs/Hero_CaveExit.prefab
-
34Assets/Objects/environment/Cliffs/Prefabs/Hero_Mountain.prefab
-
34Assets/Objects/environment/Cliffs/Prefabs/Hero_Tower.prefab
-
34Assets/Objects/environment/Cliffs/Prefabs/Rock_Large_01.prefab
-
34Assets/Objects/environment/Cliffs/Prefabs/Rock_Large_02.prefab
-
34Assets/Objects/environment/Cliffs/Prefabs/Rock_Medium_01.prefab
-
34Assets/Objects/environment/Cliffs/Prefabs/Rock_Medium_02.prefab
-
34Assets/Objects/environment/Cliffs/Prefabs/Rock_Medium_03.prefab
-
34Assets/Objects/environment/Cliffs/Prefabs/Rock_Medium_04.prefab
-
34Assets/Objects/environment/Cliffs/Prefabs/Rock_Small_01.prefab
-
34Assets/Objects/environment/Cliffs/Prefabs/Rock_Small_02.prefab
-
34Assets/Objects/environment/Cliffs/Prefabs/Rock_Small_03.prefab
-
25Assets/Objects/environment/Cliffs/Prefabs/Rock_Small_04.prefab
-
244Assets/Objects/environment/Clouds/Clouds.fbx
-
25Assets/Objects/environment/Clouds/Clouds.tif.meta
-
25Assets/Objects/environment/Trees/Maps/TreeBillBoards_Normal_Smoothness.tif.meta
-
25Assets/Objects/environment/Trees/Maps/Trees_Normal_Smoothness.tif.meta
-
108Assets/Objects/environment/Trees/Meshes/Bush_Large_01.fbx
-
410Assets/Objects/environment/Trees/Meshes/PalmB_01.fbx
-
381Assets/Objects/environment/Trees/Meshes/PalmB_02.fbx
-
268Assets/Objects/environment/Trees/Meshes/Palm_01.fbx
-
331Assets/Objects/environment/Trees/Meshes/Palm_02.fbx
-
305Assets/Objects/environment/Trees/Meshes/Palm_03.fbx
-
2Assets/Objects/misc/DefaultVolume.prefab
-
25Assets/Objects/props/houses/Maps/HousesJetty_LOW_Matr_BuildingsJettys_MetallicSmoothness.tif.meta
-
25Assets/Objects/props/houses/Maps/HousesJetty_LOW_Matr_BuildingsJettys_Normal.tif.meta
-
25Assets/Objects/props/props/Maps/Props_LOW_Matr_Props_Normal.tif.meta
-
2Assets/Objects/props/props/Materials/Matr_Props.mat
-
1001Assets/Objects/props/props/Meshes/Props_low.fbx
-
2Assets/Resources/AppSettings.prefab
-
4Assets/Scripts/Boat/HumanController.cs
-
15Assets/Scripts/Editor/AutoBuildAddressables.cs
-
1Assets/Scripts/Editor/QualitySettingsExtenstion.cs
-
196Assets/Scripts/GameSystem/AppSettings.cs
-
141Assets/Scripts/GameSystem/DefaultVolume.cs
-
324Assets/Scripts/GameSystem/InputControls.cs
-
8Assets/Scripts/GameSystem/RaceManager.cs
-
183Assets/Scripts/System/PerfomanceStats.cs
-
3Assets/Scripts/System/PerfomanceStats.cs.meta
-
61Assets/Textures/UI/Icon.png.meta
-
61Assets/Textures/UI/IconBG.png.meta
-
63Assets/Textures/UI/IconFG.png.meta
-
57Assets/Textures/UI/Splash.png.meta
-
304Assets/scenes/main_menu.unity
-
992Packages/com.verasl.water-system/Meshes/SeaVertDisp.fbx
-
270Packages/com.verasl.water-system/Meshes/Water.fbx
-
7Packages/com.verasl.water-system/Scripts/GerstnerWavesJobs.cs
-
15Packages/com.verasl.water-system/Scripts/Rendering/WaterSystemFeature.cs
-
3Packages/com.verasl.water-system/Shaders/WaterCommon.hlsl
-
27Packages/manifest.json
-
71Packages/packages-lock.json
-
10ProjectSettings/EditorBuildSettings.asset
-
27ProjectSettings/PackageManagerSettings.asset
-
81ProjectSettings/ProjectSettings.asset
-
4ProjectSettings/ProjectVersion.txt
-
2ProjectSettings/TagManager.asset
-
2ProjectSettings/URPProjectSettings.asset
519
Assets/Objects/boats/Interceptor/Interceptor.fbx
文件差异内容过多而无法显示
查看文件
文件差异内容过多而无法显示
查看文件
904
Assets/Objects/environment/Cliffs/Meshes/Env_Cliff_Full_01.fbx
文件差异内容过多而无法显示
查看文件
文件差异内容过多而无法显示
查看文件
244
Assets/Objects/environment/Clouds/Clouds.fbx
文件差异内容过多而无法显示
查看文件
文件差异内容过多而无法显示
查看文件
108
Assets/Objects/environment/Trees/Meshes/Bush_Large_01.fbx
文件差异内容过多而无法显示
查看文件
文件差异内容过多而无法显示
查看文件
|
|||
Kaydara FBX Binary L |
|||
|
|||
Kaydara FBX Binary L ( |
|||
FBXVersionIL � EncryptionTypeI ) CreationTimeStamp VersionI� 9 YearI� \ MonthI } DayI � HourI � MinuteI8 � SecondI9 MillisecondI r ) CreatorS$ FBX SDK/FBX Plugins version 2018.1.1� ' |