Skip to content
This repository was archived by the owner on Nov 13, 2024. It is now read-only.

Commit 18f8137

Browse files
m21-ceruttim21-cerutti
committed
Merge branch 'develop' into main
2 parents 8b64fe5 + 85914a0 commit 18f8137

File tree

227 files changed

+270815
-24248
lines changed

Some content is hidden

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

227 files changed

+270815
-24248
lines changed

‎.github/workflows/build_graph_request.yaml‎

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -4,45 +4,6 @@ on: workflow_dispatch
44

55
jobs:
66

7-
tests:
8-
name: Tests ${{ matrix.testMode }}
9-
runs-on: ubuntu-latest
10-
strategy:
11-
fail-fast: false
12-
matrix:
13-
testMode:
14-
- playmode
15-
- editmode
16-
steps:
17-
# Checkout
18-
- name: Checkout repository
19-
uses: actions/checkout@v2
20-
with:
21-
fetch-depth: 0
22-
# Cache
23-
- uses: actions/cache@v2
24-
with:
25-
path: Library
26-
key: Library-Test
27-
restore-keys: Library-Test
28-
# Test
29-
- name: Run tests
30-
uses: game-ci/unity-test-runner@v2
31-
env:
32-
UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
33-
with:
34-
githubToken: ${{ secrets.GITHUB_TOKEN }}
35-
testMode: ${{ matrix.testMode }}
36-
artifactsPath: ${{ matrix.testMode }}-artifacts
37-
checkName: Test Results ${{ matrix.testMode }}
38-
id: test-out
39-
# Output
40-
- uses: actions/upload-artifact@v2
41-
if: always()
42-
with:
43-
name: Test results for ${{ matrix.testMode }}
44-
path: ${{ steps.test-out.outputs.artifactsPath }}
45-
467
get-tag:
478
name: Get tag
489
runs-on: ubuntu-latest

‎.github/workflows/build_request.yaml‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -43,19 +43,22 @@ jobs:
4343
name: Test results for ${{ matrix.testMode }}
4444
path: ${{ steps.test-out.outputs.artifactsPath }}
4545

46-
get-tag:
47-
name: Get tag
46+
create-tag:
47+
name: Create tag
4848
runs-on: ubuntu-latest
4949
needs: tests
5050
outputs:
5151
tag: ${{ steps.version.outputs.tag }}
52-
steps:
52+
steps:
5353
# Checkout
5454
- name: Checkout repository
5555
uses: actions/checkout@v2
56-
# Tag fetch
57-
- name: Tag fetch
58-
uses: actions-ecosystem/action-get-latest-tag@v1
56+
# Tag
57+
- name: Tag creation
58+
uses: phish108/autotag-action@1.1.37
59+
with:
60+
github-token: ${{ secrets.GITHUB_TOKEN}}
61+
release-branch: "master,main,develop"
5962
id: version
6063

6164
build:
@@ -67,7 +70,7 @@ jobs:
6770
- StandaloneWindows
6871
- StandaloneWindows64
6972
- StandaloneLinux64
70-
needs: get-tag
73+
needs: create-tag
7174
steps:
7275
# Checkout
7376
- name: Checkout repository
@@ -94,10 +97,10 @@ jobs:
9497
- name: Zip build
9598
run: |
9699
pushd build/${{ matrix.targetPlatform }}
97-
zip -r ../../Build-${{ matrix.targetPlatform }}-${{ needs.get-tag.outputs.tag }}.zip .
100+
zip -r ../../Build-${{ matrix.targetPlatform }}-${{ needs.create-tag.outputs.tag }}.zip .
98101
popd
99102
# Output Zip
100103
- uses: actions/upload-artifact@v2
101104
with:
102-
name: Build-${{ matrix.targetPlatform }}-${{ needs.get-tag.outputs.tag }}.zip
103-
path: ./Build-${{ matrix.targetPlatform }}-${{ needs.get-tag.outputs.tag }}.zip
105+
name: Build-${{ matrix.targetPlatform }}-${{ needs.create-tag.outputs.tag }}.zip
106+
path: ./Build-${{ matrix.targetPlatform }}-${{ needs.create-tag.outputs.tag }}.zip

‎.github/workflows/dev_version.yaml‎

Lines changed: 0 additions & 25 deletions
This file was deleted.

Assets/Data/Prefabs/Collectable.meta renamed to Assets/Data/Animations/Menu Transi.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/Data/Animations/Menu Transi/Fade In.anim‎

Lines changed: 179 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,179 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!74 &7400000
4+
AnimationClip:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_Name: Fade In
10+
serializedVersion: 6
11+
m_Legacy: 0
12+
m_Compressed: 0
13+
m_UseHighQualityCurve: 1
14+
m_RotationCurves: []
15+
m_CompressedRotationCurves: []
16+
m_EulerCurves: []
17+
m_PositionCurves: []
18+
m_ScaleCurves: []
19+
m_FloatCurves:
20+
- curve:
21+
serializedVersion: 2
22+
m_Curve:
23+
- serializedVersion: 3
24+
time: 0
25+
value: 0
26+
inSlope: 0
27+
outSlope: 0
28+
tangentMode: 136
29+
weightedMode: 0
30+
inWeight: 0.33333334
31+
outWeight: 0.33333334
32+
- serializedVersion: 3
33+
time: 0.33333334
34+
value: 0.66
35+
inSlope: 1
36+
outSlope: 1
37+
tangentMode: 136
38+
weightedMode: 0
39+
inWeight: 0.33333334
40+
outWeight: 0.33333334
41+
- serializedVersion: 3
42+
time: 1
43+
value: 1
44+
inSlope: 0
45+
outSlope: 0
46+
tangentMode: 136
47+
weightedMode: 0
48+
inWeight: 0.33333334
49+
outWeight: 0.33333334
50+
m_PreInfinity: 2
51+
m_PostInfinity: 2
52+
m_RotationOrder: 4
53+
attribute: m_Color.a
54+
path: Panel
55+
classID: 114
56+
script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
57+
- curve:
58+
serializedVersion: 2
59+
m_Curve:
60+
- serializedVersion: 3
61+
time: 0
62+
value: 0
63+
inSlope: Infinity
64+
outSlope: Infinity
65+
tangentMode: 103
66+
weightedMode: 0
67+
inWeight: 0
68+
outWeight: 0
69+
m_PreInfinity: 2
70+
m_PostInfinity: 2
71+
m_RotationOrder: 4
72+
attribute: m_IsActive
73+
path: Panel/Text (TMP)
74+
classID: 1
75+
script: {fileID: 0}
76+
m_PPtrCurves: []
77+
m_SampleRate: 60
78+
m_WrapMode: 0
79+
m_Bounds:
80+
m_Center: {x: 0, y: 0, z: 0}
81+
m_Extent: {x: 0, y: 0, z: 0}
82+
m_ClipBindingConstant:
83+
genericBindings:
84+
- serializedVersion: 2
85+
path: 1668086795
86+
attribute: 304273561
87+
script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
88+
typeID: 114
89+
customType: 0
90+
isPPtrCurve: 0
91+
- serializedVersion: 2
92+
path: 1075923503
93+
attribute: 2086281974
94+
script: {fileID: 0}
95+
typeID: 1
96+
customType: 0
97+
isPPtrCurve: 0
98+
pptrCurveMapping: []
99+
m_AnimationClipSettings:
100+
serializedVersion: 2
101+
m_AdditiveReferencePoseClip: {fileID: 0}
102+
m_AdditiveReferencePoseTime: 0
103+
m_StartTime: 0
104+
m_StopTime: 1
105+
m_OrientationOffsetY: 0
106+
m_Level: 0
107+
m_CycleOffset: 0
108+
m_HasAdditiveReferencePose: 0
109+
m_LoopTime: 0
110+
m_LoopBlend: 0
111+
m_LoopBlendOrientation: 0
112+
m_LoopBlendPositionY: 0
113+
m_LoopBlendPositionXZ: 0
114+
m_KeepOriginalOrientation: 0
115+
m_KeepOriginalPositionY: 1
116+
m_KeepOriginalPositionXZ: 0
117+
m_HeightFromFeet: 0
118+
m_Mirror: 0
119+
m_EditorCurves:
120+
- curve:
121+
serializedVersion: 2
122+
m_Curve:
123+
- serializedVersion: 3
124+
time: 0
125+
value: 0
126+
inSlope: 0
127+
outSlope: 0
128+
tangentMode: 136
129+
weightedMode: 0
130+
inWeight: 0.33333334
131+
outWeight: 0.33333334
132+
- serializedVersion: 3
133+
time: 0.33333334
134+
value: 0.66
135+
inSlope: 1
136+
outSlope: 1
137+
tangentMode: 136
138+
weightedMode: 0
139+
inWeight: 0.33333334
140+
outWeight: 0.33333334
141+
- serializedVersion: 3
142+
time: 1
143+
value: 1
144+
inSlope: 0
145+
outSlope: 0
146+
tangentMode: 136
147+
weightedMode: 0
148+
inWeight: 0.33333334
149+
outWeight: 0.33333334
150+
m_PreInfinity: 2
151+
m_PostInfinity: 2
152+
m_RotationOrder: 4
153+
attribute: m_Color.a
154+
path: Panel
155+
classID: 114
156+
script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
157+
- curve:
158+
serializedVersion: 2
159+
m_Curve:
160+
- serializedVersion: 3
161+
time: 0
162+
value: 0
163+
inSlope: Infinity
164+
outSlope: Infinity
165+
tangentMode: 103
166+
weightedMode: 0
167+
inWeight: 0
168+
outWeight: 0
169+
m_PreInfinity: 2
170+
m_PostInfinity: 2
171+
m_RotationOrder: 4
172+
attribute: m_IsActive
173+
path: Panel/Text (TMP)
174+
classID: 1
175+
script: {fileID: 0}
176+
m_EulerEditorCurves: []
177+
m_HasGenericRootTransform: 0
178+
m_HasMotionFloatCurves: 0
179+
m_Events: []

‎Assets/Data/Animations/Menu Transi/Fade In.anim.meta‎

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

0 commit comments

Comments
 (0)