mirror of
https://github.com/Outer-Wilds-New-Horizons/new-horizons.git
synced 2025-12-11 20:15:44 +01:00
Merge branch 'dev' of https://github.com/xen-42/outer-wilds-new-horizons into dev
This commit is contained in:
commit
af2dc8c02a
@ -214,7 +214,7 @@ namespace NewHorizons.Builder.Props
|
|||||||
}
|
}
|
||||||
case PropModule.NomaiTextInfo.NomaiTextType.PreCrashComputer:
|
case PropModule.NomaiTextInfo.NomaiTextType.PreCrashComputer:
|
||||||
{
|
{
|
||||||
var computerObject = DetailBuilder.MakeDetail(planetGO, sector, _preCrashComputerPrefab, info.position, MVector3.zero, 1, false);
|
var computerObject = DetailBuilder.MakeDetail(planetGO, sector, _preCrashComputerPrefab, info.position, Vector3.zero, 1, false);
|
||||||
computerObject.SetActive(false);
|
computerObject.SetActive(false);
|
||||||
|
|
||||||
var up = computerObject.transform.position - planetGO.transform.position;
|
var up = computerObject.transform.position - planetGO.transform.position;
|
||||||
|
|||||||
@ -30,18 +30,7 @@ namespace NewHorizons.Handlers
|
|||||||
Logger.LogVerbose($"Adding all custom AudioTypes to the library");
|
Logger.LogVerbose($"Adding all custom AudioTypes to the library");
|
||||||
|
|
||||||
var library = Locator.GetAudioManager()._libraryAsset;
|
var library = Locator.GetAudioManager()._libraryAsset;
|
||||||
|
library.audioEntries = library.audioEntries.Concat(_audioEntries).ToArray();
|
||||||
foreach (var entry in _audioEntries)
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
library.audioEntries = library.audioEntries.Append(entry).ToArray();
|
|
||||||
}
|
|
||||||
catch(Exception ex)
|
|
||||||
{
|
|
||||||
Logger.LogError($"Couldn't add audio entry {entry.clips[0].name} to libary: {ex}");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Locator.GetAudioManager()._audioLibraryDict = library.BuildAudioEntryDictionary();
|
Locator.GetAudioManager()._audioLibraryDict = library.BuildAudioEntryDictionary();
|
||||||
}
|
}
|
||||||
|
|||||||
@ -127,7 +127,7 @@ namespace NewHorizons
|
|||||||
insideCloak = insideCloak,
|
insideCloak = insideCloak,
|
||||||
name = name,
|
name = name,
|
||||||
onlyAudibleToScope = onlyAudibleToScope,
|
onlyAudibleToScope = onlyAudibleToScope,
|
||||||
position = MVector3.zero,
|
position = Vector3.zero,
|
||||||
reveals = reveals,
|
reveals = reveals,
|
||||||
sourceRadius = sourceRadius
|
sourceRadius = sourceRadius
|
||||||
};
|
};
|
||||||
|
|||||||
@ -25,12 +25,5 @@ namespace NewHorizons.Utility
|
|||||||
{
|
{
|
||||||
return new Vector3(vec.x, vec.y, vec.z);
|
return new Vector3(vec.x, vec.y, vec.z);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static MVector3 zero => Vector3.zero;
|
|
||||||
public static MVector3 one => Vector3.one;
|
|
||||||
public static MVector3 left => Vector3.left;
|
|
||||||
public static MVector3 right => Vector3.right;
|
|
||||||
public static MVector3 up => Vector3.up;
|
|
||||||
public static MVector3 down => Vector3.down;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user