Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
JohnCorby 2022-07-13 18:29:40 -07:00
commit fc90abeed0
2 changed files with 4 additions and 12 deletions

View File

@ -575,13 +575,9 @@
"description": "Radius of the cloaking field around the planet. It's a bit finicky so experiment with different values. If you\ndon't want a cloak, leave this as 0.", "description": "Radius of the cloaking field around the planet. It's a bit finicky so experiment with different values. If you\ndon't want a cloak, leave this as 0.",
"format": "float" "format": "float"
}, },
"audioClip": { "audio": {
"type": "string", "type": "string",
"description": "Name of an existing AudioClip in the game that will play when entering the cloaking field." "description": "The audio that will play when entering the cloaking field. Can be a path to a .wav/.ogg/.mp3 file, or taken from the AudioClip list."
},
"audioFilePath": {
"type": "string",
"description": "Relative filepath to the .wav file to use as the audio. Mutually exclusive with audioClip."
} }
} }
}, },

View File

@ -36,13 +36,9 @@
"type": "boolean", "type": "boolean",
"description": "Set to `true` if you want to spawn here after dying, not Timber Hearth. You can still warp back to the main star\nsystem." "description": "Set to `true` if you want to spawn here after dying, not Timber Hearth. You can still warp back to the main star\nsystem."
}, },
"travelAudioClip": { "travelAudio": {
"type": "string", "type": "string",
"description": "Name of an existing AudioClip in the game that will play when travelling in space." "description": "The audio that will play when travelling in space. Can be a path to a .wav/.ogg/.mp3 file, or taken from the AudioClip list."
},
"travelAudioFilePath": {
"type": "string",
"description": "Relative filepath to the .wav file to use as the audio. Mutually exclusive with travelAudioClip."
}, },
"coords": { "coords": {
"description": "Coordinates that the vessel can use to warp to your solar system.", "description": "Coordinates that the vessel can use to warp to your solar system.",