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 vanillaCometTails
This commit is contained in:
commit
df86526f7d
7
.github/workflows/build.yaml
vendored
7
.github/workflows/build.yaml
vendored
@ -62,8 +62,7 @@ jobs:
|
|||||||
name: NewHorizons-Schemas-${{ inputs.build_type }}
|
name: NewHorizons-Schemas-${{ inputs.build_type }}
|
||||||
path: .\NewHorizons\Schemas
|
path: .\NewHorizons\Schemas
|
||||||
|
|
||||||
- name: Verify Changed Schemas
|
- name: Check Changed Schemas
|
||||||
uses: tj-actions/verify-changed-files@v20
|
|
||||||
id: changed_files
|
id: changed_files
|
||||||
with:
|
run: |
|
||||||
files: NewHorizons/Schemas/**
|
echo "files_changed=$(git diff --exit-code NewHorizons/Schemas 2>&1>$null && echo false || echo true)" >> $Env:GITHUB_OUTPUT
|
||||||
@ -69,6 +69,8 @@ namespace NewHorizons.Builder.General
|
|||||||
PlayerSpawn = playerSpawn;
|
PlayerSpawn = playerSpawn;
|
||||||
PlayerSpawnInfo = point;
|
PlayerSpawnInfo = point;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
spawnGO.SetActive(true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -77,7 +79,6 @@ namespace NewHorizons.Builder.General
|
|||||||
foreach (var point in module.shipSpawnPoints)
|
foreach (var point in module.shipSpawnPoints)
|
||||||
{
|
{
|
||||||
var spawnGO = GeneralPropBuilder.MakeNew("ShipSpawnPoint", planetGO, null, point);
|
var spawnGO = GeneralPropBuilder.MakeNew("ShipSpawnPoint", planetGO, null, point);
|
||||||
spawnGO.SetActive(false);
|
|
||||||
spawnGO.layer = Layer.PlayerSafetyCollider;
|
spawnGO.layer = Layer.PlayerSafetyCollider;
|
||||||
|
|
||||||
var shipSpawn = spawnGO.AddComponent<SpawnPoint>();
|
var shipSpawn = spawnGO.AddComponent<SpawnPoint>();
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user