Skip to content

Commit ce2f723

Browse files
author
luiza.torello
committed
Merge branch 'fix/quest-experiment-merge-with-develop' of https://github.com/LeonardoTPereira/Overlord-Project into fix/quest-experiment-merge-with-develop
2 parents a81b8a1 + 3b392bb commit ce2f723

File tree

131 files changed

+1262
-2414
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

131 files changed

+1262
-2414
lines changed

.github/workflows/deploy.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ jobs:
2626
echo "$UNITY_LICENSE" | tr -d '\r' > UnityLicenseFile.ulf
2727
unity-editor -nographics -logFile /dev/stdout -manualLicenseFile UnityLicenseFile.ulf -quit | echo "Activation finished"
2828
- name: Checkout repository
29-
uses: actions/checkout@v2
29+
uses: actions/checkout@v4
3030

3131
- name: Cache Library
3232
id: cache-library
33-
uses: actions/cache@v2
33+
uses: actions/cache@v4
3434
with:
3535
path: Library
3636
key: Library-2020.3.16
@@ -101,7 +101,7 @@ jobs:
101101
uses: actions/checkout@v2
102102

103103
- name: Download artifact
104-
uses: dawidd6/action-download-artifact@v2
104+
uses: dawidd6/action-download-artifact@v6
105105
with:
106106
# Optional, GitHub token, a Personal Access Token with `public_repo` scope if needed
107107
# Required, if artifact is from a different repo
@@ -128,4 +128,4 @@ jobs:
128128
uses: JamesIves/[email protected]
129129
with:
130130
branch: gh-pages
131-
folder: build/WebGL
131+
folder: build/WebGL

.github/workflows/main.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,26 +23,26 @@ jobs:
2323
echo "$UNITY_LICENSE" | tr -d '\r' > UnityLicenseFile.ulf
2424
unity-editor -nographics -logFile /dev/stdout -manualLicenseFile UnityLicenseFile.ulf -quit | echo "Activation finished"
2525
- name: Checkout repository
26-
uses: actions/checkout@v3
26+
uses: actions/checkout@v4
2727
with:
2828
lfs: true
2929

3030
- name: Restore Library cache
31-
uses: actions/cache@v2
31+
uses: actions/cache@v4
3232
with:
3333
path: Library
3434
key: Library-${{ hashFiles('Assets/**', 'Packages/**', 'ProjectSettings/**') }}
3535
restore-keys: |
3636
Library-
3737
3838
- name: Build WebGL
39-
uses: game-ci/unity-builder@v2
39+
uses: game-ci/unity-builder@v4
4040
env:
4141
UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
4242
with:
4343
targetPlatform: WebGL
4444

45-
- uses: actions/upload-artifact@v2
45+
- uses: actions/upload-artifact@v4
4646
with:
4747
name: build-WebGL
4848
path: build/WebGL
@@ -52,12 +52,12 @@ jobs:
5252
runs-on: ubuntu-latest
5353
steps:
5454
- name: Checkout repository
55-
uses: actions/checkout@v3
55+
uses: actions/checkout@v4
5656
with:
5757
lfs: true
5858

5959
- name: Download artifact
60-
uses: actions/download-artifact@v2
60+
uses: actions/download-artifact@v4
6161
with:
6262
name: build-WebGL
6363
path: build/WebGL

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
/[Bb]uilds/
1010
/[Ll]ogs/
1111
/[Uu]ser[Ss]ettings/
12+
/[Aa]ssets/.VSCodeCounter/
1213

1314
# MemoryCaptures can get excessive in size.
1415
# They also could contain extremely sensitive data

Assets/PlatformGameAssets/Prefabs/Player/PlatformPlayerAndCamera.prefab

Lines changed: 3 additions & 38 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)