Gittes-archive/new-horizons
2
0
Fork 0
mirror of https://github.com/Outer-Wilds-New-Horizons/new-horizons.git synced 2025-12-11 20:15:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'water' into dev

Browse Source
This commit is contained in:
JohnCorby 2022-05-19 22:20:44 -07:00
commit 4d06292d5c
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
NewHorizons/Builder/Body/WaterBuilder.cs
View File

@ -3,6 +3,7 @@ using NewHorizons.Components.SizeControllers;
using NewHorizons.Utility; using NewHorizons.Utility;
using UnityEngine; using UnityEngine;
using NewHorizons.External.Modules.VariableSize; using NewHorizons.External.Modules.VariableSize;
using Tessellation;
namespace NewHorizons.Builder.Body namespace NewHorizons.Builder.Body
{ {
@ -21,7 +22,7 @@ namespace NewHorizons.Builder.Body
var GDTSR = GameObject.Find("Ocean_GD").GetComponent<TessellatedSphereRenderer>(); var GDTSR = GameObject.Find("Ocean_GD").GetComponent<TessellatedSphereRenderer>();
TessellatedSphereRenderer TSR = waterGO.AddComponent<TessellatedSphereRenderer>(); TessellatedSphereRenderer TSR = waterGO.AddComponent<TessellatedSphereRenderer>();
TSR.tessellationMeshGroup = new Tessellation.MeshGroup(); TSR.tessellationMeshGroup = ScriptableObject.CreateInstance<MeshGroup>();
for (int i = 0; i < 16; i++) for (int i = 0; i < 16; i++)
{ {
var mesh = new Mesh(); var mesh = new Mesh();
@ -72,7 +73,7 @@ namespace NewHorizons.Builder.Body
fluidVolume._attachedBody = rb; fluidVolume._attachedBody = rb;
fluidVolume._triggerVolume = buoyancyTriggerVolume; fluidVolume._triggerVolume = buoyancyTriggerVolume;
fluidVolume._radius = waterSize; fluidVolume._radius = waterSize;
fluidVolume._layer = LayerMask.NameToLayer("BassicEffectVolume"); fluidVolume._layer = LayerMask.NameToLayer("BasicEffectVolume");
var fogGO = GameObject.Instantiate(GameObject.Find("GiantsDeep_Body/Sector_GD/Sector_GDInterior/Effects_GDInterior/OceanFog"), waterGO.transform); var fogGO = GameObject.Instantiate(GameObject.Find("GiantsDeep_Body/Sector_GD/Sector_GDInterior/Effects_GDInterior/OceanFog"), waterGO.transform);
fogGO.name = "OceanFog"; fogGO.name = "OceanFog";

4
NewHorizons/NewHorizons.csproj
View File

@ -17,8 +17,8 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="HarmonyX" Version="2.10.0" /> <PackageReference Include="HarmonyX" Version="2.10.0" />
<PackageReference Include="OWML" Version="2.1.0" /> <PackageReference Include="OWML" Version="2.3.3" />
<PackageReference Include="OuterWildsGameLibs" Version="1.1.11.73" /> <PackageReference Include="OuterWildsGameLibs" Version="1.1.12.168" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="default-config.json"> <None Include="default-config.json">

2
NewHorizons/manifest.json
View File

@ -4,7 +4,7 @@
"name": "New Horizons", "name": "New Horizons",
"uniqueName": "xen.NewHorizons", "uniqueName": "xen.NewHorizons",
"version": "1.1.0", "version": "1.1.0",
"owmlVersion": "2.1.0", "owmlVersion": "2.3.3",
"conflicts": [ "Raicuparta.QuantumSpaceBuddies", "Vesper.AutoResume", "PacificEngine.OW_Randomizer" ], "conflicts": [ "Raicuparta.QuantumSpaceBuddies", "Vesper.AutoResume", "PacificEngine.OW_Randomizer" ],
"pathsToPreserve": [ "planets", "systems", "translations" ] "pathsToPreserve": [ "planets", "systems", "translations" ]
} }