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

This commit is contained in:
JohnCorby 2022-07-28 18:05:33 -07:00
commit 985f61fc98
5 changed files with 32 additions and 16 deletions

View File

@ -23,10 +23,3 @@ jobs:
uses: './.github/workflows/update_schemas.yml' uses: './.github/workflows/update_schemas.yml'
with: with:
artifact_name: NewHorizons-Schemas-Debug artifact_name: NewHorizons-Schemas-Debug
Build_Docs:
name: 'Build Docs'
needs: Build
if: ${{ needs.Build.outputs.schemas_changed == 'true' }}
uses: './.github/workflows/docs_build.yml'
with:
schemas_artifact: NewHorizons-Schemas-Debug

View File

@ -18,8 +18,18 @@ env:
URL_PREFIX: '/' URL_PREFIX: '/'
PIPENV_VENV_IN_PROJECT: 1 PIPENV_VENV_IN_PROJECT: 1
permissions:
contents: read
pages: write
id-token: write
concurrency:
group: "pages"
cancel-in-progress: true
jobs: jobs:
build: build:
name: Build Docs
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
@ -63,15 +73,21 @@ jobs:
command: run menagerie generate command: run menagerie generate
- name: Upload Artifact - name: Upload Artifact
uses: actions/upload-artifact@v2 if: success() && github.ref == 'refs/heads/main'
uses: actions/upload-pages-artifact@v1
with: with:
name: Built-Docs
path: out/ path: out/
- name: Deploy To Pages deploy:
if: success() && github.ref == 'refs/heads/main' environment:
uses: JamesIves/github-pages-deploy-action@4.1.5 name: github-pages
with: url: ${{ steps.deployment.outputs.page_url }}
branch: gh-pages runs-on: ubuntu-latest
folder: out/ name: Deploy Docs
needs: build
if: github.ref == 'refs/heads/main'
steps:
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v1

View File

@ -8,6 +8,11 @@ on:
description: 'Name of the artifact to download and check against' description: 'Name of the artifact to download and check against'
type: string type: string
# Prevents schemas from trying to update on old commits
concurrency:
group: "schemas-${{ github.ref }}"
cancel-in-progress: true
jobs: jobs:
update_schemas: update_schemas:
runs-on: ubuntu-latest runs-on: ubuntu-latest

View File

@ -14,3 +14,6 @@ Uh idk what to put here thought it would be funny haha
![image](https://user-images.githubusercontent.com/25644444/178856213-44cb0a38-6d3d-4af6-b7f8-0ae6cda8d44a.png) ![image](https://user-images.githubusercontent.com/25644444/178856213-44cb0a38-6d3d-4af6-b7f8-0ae6cda8d44a.png)
## Test
aaaaaaaaaaaaaaaaaaaaaaaaa

View File

@ -8,7 +8,6 @@ Sort_Priority: 85
For physical objects there are currently two ways of setting them up: specify an asset bundle and path to load a custom asset you created, or specify the path to the item you want to copy from the game in the scene hierarchy. Use the [Unity Explorer](https://outerwildsmods.com/mods/unityexplorer){ target="_blank" } mod to find an object you want to copy onto your new body. Some objects work better than others for this. Good luck. Some pointers: For physical objects there are currently two ways of setting them up: specify an asset bundle and path to load a custom asset you created, or specify the path to the item you want to copy from the game in the scene hierarchy. Use the [Unity Explorer](https://outerwildsmods.com/mods/unityexplorer){ target="_blank" } mod to find an object you want to copy onto your new body. Some objects work better than others for this. Good luck. Some pointers:
- Use "Object Explorer" to search - Use "Object Explorer" to search
- Do not use the search functionality on Scene Explorer, it is really, really slow. Use the "Object Search" tab instead.
- Generally you can find planets by writing their name with no spaces/punctuation followed by "_Body". - Generally you can find planets by writing their name with no spaces/punctuation followed by "_Body".
- There's also [this community-maintained list of props](https://docs.google.com/spreadsheets/d/1VJaglB1kRL0VqaXhvXepIeymo93zqhWex-j7_QDm6NE/edit?usp=sharing) which you can use to find interesting props and check to see if they have collision. - There's also [this community-maintained list of props](https://docs.google.com/spreadsheets/d/1VJaglB1kRL0VqaXhvXepIeymo93zqhWex-j7_QDm6NE/edit?usp=sharing) which you can use to find interesting props and check to see if they have collision.