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 'dev' into fix-layers

Browse Source
This commit is contained in:
JohnCorby 2023-06-05 19:52:58 -07:00
commit fcea8740eb
9 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NewHorizons/External/Modules/AtmosphereModule.cs vendored
View File

@ -120,7 +120,7 @@ namespace NewHorizons.External.Modules
/// <summary> /// <summary>
/// Fluid type for sounds/effects when colliding with this cloud. /// Fluid type for sounds/effects when colliding with this cloud.
/// </summary> /// </summary>
[DefaultValue("cloud")] public NHFluidType fluidType = NHFluidType.Cloud; [DefaultValue("cloud")] public NHFluidType fluidType = NHFluidType.CLOUD;
/// <summary> /// <summary>
/// Add lightning to this planet like on Giant's Deep. /// Add lightning to this planet like on Giant's Deep.

3
NewHorizons/External/Modules/Props/Audio/AudioSourceInfo.cs vendored
View File

@ -8,7 +8,8 @@ namespace NewHorizons.External.Modules.Props.Audio
public class AudioSourceInfo : BaseAudioInfo public class AudioSourceInfo : BaseAudioInfo
{ {
/// <summary> /// <summary>
/// The audio track of this audio source /// The audio track of this audio source.
/// Most of the time you'll use environment (the default) for sound effects and music for music.
/// </summary> /// </summary>
[DefaultValue("environment")] public NHAudioMixerTrackName track = NHAudioMixerTrackName.Environment; [DefaultValue("environment")] public NHAudioMixerTrackName track = NHAudioMixerTrackName.Environment;
} }

2
NewHorizons/External/Modules/Props/TornadoInfo.cs vendored
View File

@ -68,7 +68,7 @@ namespace NewHorizons.External.Modules.Props
/// <summary> /// <summary>
/// Fluid type for sounds/effects when colliding with this tornado. /// Fluid type for sounds/effects when colliding with this tornado.
/// </summary> /// </summary>
[DefaultValue("cloud")] public NHFluidType fluidType = NHFluidType.Cloud; [DefaultValue("cloud")] public NHFluidType fluidType = NHFluidType.CLOUD;
} }
} }

2
NewHorizons/External/Modules/RingModule.cs vendored
View File

@ -12,7 +12,7 @@ namespace NewHorizons.External.Modules
/// <summary> /// <summary>
/// Fluid type for sounds/effects when colliding with this ring. /// Fluid type for sounds/effects when colliding with this ring.
/// </summary> /// </summary>
public NHFluidType fluidType = NHFluidType.None; public NHFluidType fluidType = NHFluidType.NONE;
/// <summary> /// <summary>
/// Angle between the rings and the equatorial plane of the planet. /// Angle between the rings and the equatorial plane of the planet.

3
NewHorizons/External/Modules/Volumes/VolumeInfos/AudioVolumeInfo.cs vendored
View File

@ -16,7 +16,8 @@ namespace NewHorizons.External.Modules.Volumes.VolumeInfos
[DefaultValue("random")] public NHClipSelectionType clipSelection = NHClipSelectionType.RANDOM; [DefaultValue("random")] public NHClipSelectionType clipSelection = NHClipSelectionType.RANDOM;
/// <summary> /// <summary>
/// The audio track of this audio volume /// The audio track of this audio volume.
/// Most of the time you'll use environment (the default) for sound effects and music for music.
/// </summary> /// </summary>
[DefaultValue("environment")] public NHAudioMixerTrackName track = NHAudioMixerTrackName.Environment; [DefaultValue("environment")] public NHAudioMixerTrackName track = NHAudioMixerTrackName.Environment;

10
NewHorizons/External/SerializableEnums/NHFluidType.cs vendored
View File

@ -7,14 +7,14 @@ namespace NewHorizons.External.SerializableEnums
[JsonConverter(typeof(StringEnumConverter))] [JsonConverter(typeof(StringEnumConverter))]
public enum NHFluidType public enum NHFluidType
{ {
[EnumMember(Value = @"none")] None = 0, [EnumMember(Value = @"none")] NONE = 0,
[EnumMember(Value = @"water")] Water = 1, [EnumMember(Value = @"water")] WATER = 1,
[EnumMember(Value = @"cloud")] Cloud = 2, [EnumMember(Value = @"cloud")] CLOUD = 2,
[EnumMember(Value = @"sand")] Sand = 3, [EnumMember(Value = @"sand")] SAND = 3,
[EnumMember(Value = @"plasma")] Plasma = 4 [EnumMember(Value = @"plasma")] PLASMA = 4
} }
} }

14
NewHorizons/Schemas/body_schema.json
View File

@ -484,11 +484,11 @@
"type": "string", "type": "string",
"description": "", "description": "",
"x-enumNames": [ "x-enumNames": [
"None", "NONE",
"Water", "WATER",
"Cloud", "CLOUD",
"Sand", "SAND",
"Plasma" "PLASMA"
], ],
"enum": [ "enum": [
"none", "none",
@ -2690,7 +2690,7 @@
"description": "An optional rename of this object" "description": "An optional rename of this object"
}, },
"track": { "track": {
"description": "The audio track of this audio source", "description": "The audio track of this audio source.\nMost of the time you'll use environment (the default) for sound effects and music for music. ",
"default": "environment", "default": "environment",
"$ref": "#/definitions/NHAudioMixerTrackName" "$ref": "#/definitions/NHAudioMixerTrackName"
} }
@ -3424,7 +3424,7 @@
"$ref": "#/definitions/NHClipSelectionType" "$ref": "#/definitions/NHClipSelectionType"
}, },
"track": { "track": {
"description": "The audio track of this audio volume", "description": "The audio track of this audio volume.\nMost of the time you'll use environment (the default) for sound effects and music for music. ",
"default": "environment", "default": "environment",
"$ref": "#/definitions/NHAudioMixerTrackName" "$ref": "#/definitions/NHAudioMixerTrackName"
}, },

6
NewHorizons/Utility/NewHorizonExtensions.cs
View File

@ -255,13 +255,13 @@ namespace NewHorizons.Utility
} }
public static FluidVolume.Type ConvertToOW(this NHFluidType fluidType, FluidVolume.Type @default = FluidVolume.Type.NONE) public static FluidVolume.Type ConvertToOW(this NHFluidType fluidType, FluidVolume.Type @default = FluidVolume.Type.NONE)
=> EnumUtils.Parse(fluidType.ToString().ToUpper(), @default); => EnumUtils.Parse(fluidType.ToString(), @default);
public static OWAudioMixer.TrackName ConvertToOW(this NHAudioMixerTrackName trackName, OWAudioMixer.TrackName @default = OWAudioMixer.TrackName.Environment) public static OWAudioMixer.TrackName ConvertToOW(this NHAudioMixerTrackName trackName, OWAudioMixer.TrackName @default = OWAudioMixer.TrackName.Environment)
=> EnumUtils.Parse(trackName.ToString().ToUpper(), @default); => EnumUtils.Parse(trackName.ToString(), @default);
public static OWAudioSource.ClipSelectionOnPlay ConvertToOW(this NHClipSelectionType clipSelection, OWAudioSource.ClipSelectionOnPlay @default = OWAudioSource.ClipSelectionOnPlay.RANDOM) public static OWAudioSource.ClipSelectionOnPlay ConvertToOW(this NHClipSelectionType clipSelection, OWAudioSource.ClipSelectionOnPlay @default = OWAudioSource.ClipSelectionOnPlay.RANDOM)
=> EnumUtils.Parse(clipSelection.ToString().ToUpper(), @default); => EnumUtils.Parse(clipSelection.ToString(), @default);
public static void SmoothLookDir(this GameObject go, Vector3 direction, float dt, float angularVelocity) public static void SmoothLookDir(this GameObject go, Vector3 direction, float dt, float angularVelocity)
{ {

2
NewHorizons/manifest.json
View File

@ -4,7 +4,7 @@
"author": "xen, Bwc9876, clay, MegaPiggy, John, Trifid, Hawkbar, Book", "author": "xen, Bwc9876, clay, MegaPiggy, John, Trifid, Hawkbar, Book",
"name": "New Horizons", "name": "New Horizons",
"uniqueName": "xen.NewHorizons", "uniqueName": "xen.NewHorizons",
"version": "1.11.0", "version": "1.11.1",
"owmlVersion": "2.9.0", "owmlVersion": "2.9.0",
"dependencies": [ "JohnCorby.VanillaFix", "_nebula.MenuFramework", "xen.CommonCameraUtility", "dgarro.CustomShipLogModes" ], "dependencies": [ "JohnCorby.VanillaFix", "_nebula.MenuFramework", "xen.CommonCameraUtility", "dgarro.CustomShipLogModes" ],
"conflicts": [ "Raicuparta.QuantumSpaceBuddies", "PacificEngine.OW_CommonResources" ], "conflicts": [ "Raicuparta.QuantumSpaceBuddies", "PacificEngine.OW_CommonResources" ],