Merge branch 'main' into develop

This commit is contained in:
Oliver Booth 2023-04-13 02:38:39 +01:00
commit a07cc4118a
No known key found for this signature in database
GPG Key ID: 20BEB9DC87961025
2 changed files with 4 additions and 2 deletions

View File

@ -13,7 +13,9 @@ jobs:
uses: actions/checkout@v3 uses: actions/checkout@v3
- name: Copy favicon - name: Copy favicon
run: cp branding_Icon.png docfx_project/images/favicon.png run: |
mkdir docfx_project/images
cp branding_Icon.png docfx_project/images/favicon.png
- name: Build documentation - name: Build documentation
uses: nikeee/docfx-action@v1.0.0 uses: nikeee/docfx-action@v1.0.0

View File

@ -26,7 +26,7 @@ To install X10D in Unity, follow the steps blow:
The [upm](https://github.com/oliverbooth/X10D/tree/upm) branch contains the latest nightly - that is the bleeding edge version of X10D. The [upm](https://github.com/oliverbooth/X10D/tree/upm) branch contains the latest nightly - that is the bleeding edge version of X10D.
If you'd like to remain on a stable release, specify a commit hash after the `#` instead of `upm`. If you'd like to remain on a stable release, specify a commit hash after the `#` instead of `upm`.
The latest current stable is 3.1.0, which is commit [9f3b09661b09e83690318370eea808e70dd4a72c](https://github.com/oliverbooth/X10D/commit/9f3b09661b09e83690318370eea808e70dd4a72c). The latest current stable is 3.2.0, which is commit [55898d9e70228380b2d039c55e36d89cfe8a0fa2](https://github.com/oliverbooth/X10D/commit/55898d9e70228380b2d039c55e36d89cfe8a0fa2).
Keep in mind that referencing a specific commit rather than the `upm` branch will prevent the auto-updater in Unity from detecting new versions. Keep in mind that referencing a specific commit rather than the `upm` branch will prevent the auto-updater in Unity from detecting new versions.
## Contributing ## Contributing