mirror of
https://github.com/Outer-Wilds-New-Horizons/new-horizons.git
synced 2025-12-11 20:15:44 +01:00
Merge branch 'dev' into hawkbar-sector-paths
This commit is contained in:
commit
453049bc1a
@ -68,3 +68,9 @@ These will automatically be converted from strings to the proper enum type.
|
||||
## Contributing to Documentation
|
||||
|
||||
If you wish to contribute to the documentation, take a look at [CONTRIBUTING.md](docs/CONTRIBUTING.md) in the docs folder.
|
||||
|
||||
## Disclaimer
|
||||
|
||||
This should go without saying, but we will not accept PRs that are obviously AI generated, nor will we accept PRs from people who have not actually played the game or any mods.
|
||||
|
||||
Any potential bug bounties for New Horizons are only eligible to be claimed by those who have created mods for Outer Wilds in the past.
|
||||
|
||||
@ -15,11 +15,15 @@ namespace NewHorizons.Builder.Volumes
|
||||
public static InteractReceiver Make(GameObject planetGO, Sector sector, InteractionVolumeInfo info, IModBehaviour mod)
|
||||
{
|
||||
// Interaction volumes must use colliders because the first-person interaction system uses raycasting
|
||||
if (info.shape != null)
|
||||
if (info.shape != null && info.shape?.useShape == false)
|
||||
{
|
||||
info.shape.useShape = false;
|
||||
NHLogger.LogError($"Interaction volumes only support colliders. Affects planet [{planetGO.name}]. Set useShape to false.");
|
||||
}
|
||||
|
||||
// If info.shape was null, it will still default to using a sphere with info.radius, just make sure it does so with a collider
|
||||
info.shape ??= new();
|
||||
info.shape.useShape = false;
|
||||
|
||||
var receiver = VolumeBuilder.Make<InteractReceiver>(planetGO, ref sector, info);
|
||||
receiver.gameObject.layer = Layer.Interactible;
|
||||
|
||||
|
||||
@ -6,8 +6,8 @@ namespace NewHorizons.External.Modules.VariableSize
|
||||
public class VariableSizeModule
|
||||
{
|
||||
/// <summary>
|
||||
/// Scale this object over time. Time value is in minutes.
|
||||
/// Scale this object over time. Time is in minutes. Value is a multiplier of the size of the object.
|
||||
/// </summary>
|
||||
public TimeValuePair[] curve;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -83,7 +83,7 @@ namespace NewHorizons
|
||||
|
||||
public GameObject GetPlanet(string name)
|
||||
{
|
||||
return Main.BodyDict.Values.SelectMany(x => x)?.ToList()?.FirstOrDefault(x => x.Config.name == name)?.Object;
|
||||
return Main.BodyDict[Main.Instance.CurrentStarSystem].FirstOrDefault(x => x.Config.name == name)?.Object;
|
||||
}
|
||||
|
||||
public string GetCurrentStarSystem() => Main.Instance.CurrentStarSystem;
|
||||
|
||||
@ -1886,7 +1886,7 @@
|
||||
"properties": {
|
||||
"curve": {
|
||||
"type": "array",
|
||||
"description": "Scale this object over time. Time value is in minutes.",
|
||||
"description": "Scale this object over time. Time is in minutes. Value is a multiplier of the size of the object.",
|
||||
"items": {
|
||||
"$ref": "#/definitions/TimeValuePair"
|
||||
}
|
||||
@ -2075,7 +2075,7 @@
|
||||
"properties": {
|
||||
"curve": {
|
||||
"type": "array",
|
||||
"description": "Scale this object over time. Time value is in minutes.",
|
||||
"description": "Scale this object over time. Time is in minutes. Value is a multiplier of the size of the object.",
|
||||
"items": {
|
||||
"$ref": "#/definitions/TimeValuePair"
|
||||
}
|
||||
@ -4972,7 +4972,7 @@
|
||||
"properties": {
|
||||
"curve": {
|
||||
"type": "array",
|
||||
"description": "Scale this object over time. Time value is in minutes.",
|
||||
"description": "Scale this object over time. Time is in minutes. Value is a multiplier of the size of the object.",
|
||||
"items": {
|
||||
"$ref": "#/definitions/TimeValuePair"
|
||||
}
|
||||
@ -5261,7 +5261,7 @@
|
||||
"properties": {
|
||||
"curve": {
|
||||
"type": "array",
|
||||
"description": "Scale this object over time. Time value is in minutes.",
|
||||
"description": "Scale this object over time. Time is in minutes. Value is a multiplier of the size of the object.",
|
||||
"items": {
|
||||
"$ref": "#/definitions/TimeValuePair"
|
||||
}
|
||||
@ -5427,7 +5427,7 @@
|
||||
"properties": {
|
||||
"curve": {
|
||||
"type": "array",
|
||||
"description": "Scale this object over time. Time value is in minutes.",
|
||||
"description": "Scale this object over time. Time is in minutes. Value is a multiplier of the size of the object.",
|
||||
"items": {
|
||||
"$ref": "#/definitions/TimeValuePair"
|
||||
}
|
||||
@ -8110,7 +8110,7 @@
|
||||
"properties": {
|
||||
"curve": {
|
||||
"type": "array",
|
||||
"description": "Scale this object over time. Time value is in minutes.",
|
||||
"description": "Scale this object over time. Time is in minutes. Value is a multiplier of the size of the object.",
|
||||
"items": {
|
||||
"$ref": "#/definitions/TimeValuePair"
|
||||
}
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
"author": "xen, Bwc9876, JohnCorby, MegaPiggy, and friends",
|
||||
"name": "New Horizons",
|
||||
"uniqueName": "xen.NewHorizons",
|
||||
"version": "1.28.6",
|
||||
"version": "1.28.8",
|
||||
"owmlVersion": "2.12.1",
|
||||
"dependencies": [ "JohnCorby.VanillaFix", "xen.CommonCameraUtility", "dgarro.CustomShipLogModes" ],
|
||||
"conflicts": [ "PacificEngine.OW_CommonResources" ],
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user