Skip to content

Commit 1b3a415

Browse files
KariaroKariaro
authored
Merge pull request #87 from Kariaro/develop
Develop
2 parents 3463207 + 040377c commit 1b3a415

File tree

160 files changed

+7356
-6091
lines changed

Some content is hidden

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

160 files changed

+7356
-6091
lines changed

‎.github/workflows/build.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ on:
66
tag:
77
type: string
88
default: v0.10.1-macos11
9+
ref:
10+
type: string
911
secrets:
1012
unityLicense:
1113
required: true
@@ -25,6 +27,8 @@ jobs:
2527
steps:
2628
- name: Checkout code
2729
uses: actions/checkout@v3
30+
with:
31+
ref: ${{ inputs.ref }}
2832

2933
- name: Download libs
3034
run: bash download_libs.sh "${{ inputs.tag }}"

‎.github/workflows/main.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ jobs:
1212
uses: ./.github/workflows/build.yml
1313
with:
1414
tag: ${{ inputs.tag }}
15+
ref: ${{ github.event.ref }}
1516
secrets:
1617
unityLicense: ${{ secrets.UNITY_LICENSE }}
1718
githubToken: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/push.yml‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,24 @@
11
name: Push Checks
22

33
on:
4-
pull_request: {}
4+
push: {}
5+
pull_request_target:
6+
types: labeled
57
jobs:
8+
check-test-trigger:
9+
runs-on: ubuntu-latest
10+
if: github.event_name == 'push' || contains(github.event.pull_request.labels.*.name, 'ci:run')
11+
steps:
12+
- uses: actions-ecosystem/action-remove-labels@v1
13+
if: contains(github.event.pull_request.labels.*.name, 'ci:run')
14+
with:
15+
labels: ci:run
616
builds:
717
name: Builds
818
uses: ./.github/workflows/build.yml
19+
needs: check-test-trigger
20+
with:
21+
ref: ${{ github.event.pull_request.head.sha }}
922
secrets:
1023
unityLicense: ${{ secrets.UNITY_LICENSE }}
1124
githubToken: ${{ secrets.GITHUB_TOKEN }}

‎Assets/Scenes/Debugging/GUI/GUIDebugWorkspace.unity‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,6 @@ GameObject:
134134
- component: {fileID: 275874967}
135135
- component: {fileID: 275874978}
136136
- component: {fileID: 275874975}
137-
- component: {fileID: 275874970}
138137
- component: {fileID: 275874977}
139138
- component: {fileID: 275874973}
140139
m_Layer: 0
@@ -159,19 +158,6 @@ Transform:
159158
m_Father: {fileID: 0}
160159
m_RootOrder: 3
161160
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
162-
--- !u!114 &275874970
163-
MonoBehaviour:
164-
m_ObjectHideFlags: 0
165-
m_CorrespondingSourceObject: {fileID: 0}
166-
m_PrefabInstance: {fileID: 0}
167-
m_PrefabAsset: {fileID: 0}
168-
m_GameObject: {fileID: 275874966}
169-
m_Enabled: 1
170-
m_EditorHideFlags: 0
171-
m_Script: {fileID: 11500000, guid: d5da564da19cb6b7d8e4f97f269edc5d, type: 3}
172-
m_Name:
173-
m_EditorClassIdentifier:
174-
_poolSize: 10
175161
--- !u!114 &275874973
176162
MonoBehaviour:
177163
m_ObjectHideFlags: 0
@@ -226,7 +212,6 @@ MonoBehaviour:
226212
m_Name:
227213
m_EditorClassIdentifier:
228214
graphRunner: {fileID: 275874975}
229-
textureFramePool: {fileID: 275874970}
230215
defaultVrmModel: {fileID: 1321532676}
231216
defaultVrmPrefab: {fileID: 4171595189632753852, guid: 594ce1711b5217f438c8a8137bb9627a, type: 3}
232217
defaultController: {fileID: 9100000, guid: 5d9fb0b38102bfa4381749fecd7d9df6, type: 2}

‎Assets/Scenes/Debugging/Hands/HandDebugWorkspace.unity‎

Lines changed: 30 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ GameObject:
139139
m_Icon: {fileID: 0}
140140
m_NavMeshLayer: 0
141141
m_StaticEditorFlags: 0
142-
m_IsActive: 1
142+
m_IsActive: 0
143143
--- !u!114 &246612463
144144
MonoBehaviour:
145145
m_ObjectHideFlags: 0
@@ -185,7 +185,6 @@ GameObject:
185185
- component: {fileID: 275874967}
186186
- component: {fileID: 275874978}
187187
- component: {fileID: 275874975}
188-
- component: {fileID: 275874970}
189188
- component: {fileID: 275874977}
190189
- component: {fileID: 275874973}
191190
m_Layer: 0
@@ -211,19 +210,6 @@ Transform:
211210
m_Father: {fileID: 0}
212211
m_RootOrder: 3
213212
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
214-
--- !u!114 &275874970
215-
MonoBehaviour:
216-
m_ObjectHideFlags: 0
217-
m_CorrespondingSourceObject: {fileID: 0}
218-
m_PrefabInstance: {fileID: 0}
219-
m_PrefabAsset: {fileID: 0}
220-
m_GameObject: {fileID: 275874966}
221-
m_Enabled: 1
222-
m_EditorHideFlags: 0
223-
m_Script: {fileID: 11500000, guid: d5da564da19cb6b7d8e4f97f269edc5d, type: 3}
224-
m_Name:
225-
m_EditorClassIdentifier:
226-
_poolSize: 10
227213
--- !u!114 &275874973
228214
MonoBehaviour:
229215
m_ObjectHideFlags: 0
@@ -278,7 +264,6 @@ MonoBehaviour:
278264
m_Name:
279265
m_EditorClassIdentifier:
280266
graphRunner: {fileID: 275874975}
281-
textureFramePool: {fileID: 275874970}
282267
defaultVrmModel: {fileID: 1321532676}
283268
defaultVrmPrefab: {fileID: 4171595189632753852, guid: 594ce1711b5217f438c8a8137bb9627a, type: 3}
284269
defaultController: {fileID: 9100000, guid: 5d9fb0b38102bfa4381749fecd7d9df6, type: 2}
@@ -289,35 +274,6 @@ MonoBehaviour:
289274
fps: 60
290275
renderUpdate: 0
291276
meshObject: {fileID: 1993461921}
292-
--- !u!1001 &548834500
293-
PrefabInstance:
294-
m_ObjectHideFlags: 0
295-
serializedVersion: 2
296-
m_Modification:
297-
m_TransformParent: {fileID: 0}
298-
m_Modifications:
299-
- target: {fileID: 6447137187136765228, guid: 32e66da3044252644bf1e8afdfa1867b, type: 3}
300-
propertyPath: m_Name
301-
value: Customizable Panel
302-
objectReference: {fileID: 0}
303-
- target: {fileID: 6447137187136765231, guid: 32e66da3044252644bf1e8afdfa1867b, type: 3}
304-
propertyPath: m_RootOrder
305-
value: 1
306-
objectReference: {fileID: 0}
307-
- target: {fileID: 6447137187136765231, guid: 32e66da3044252644bf1e8afdfa1867b, type: 3}
308-
propertyPath: m_LocalEulerAnglesHint.x
309-
value: 0
310-
objectReference: {fileID: 0}
311-
- target: {fileID: 6447137187136765231, guid: 32e66da3044252644bf1e8afdfa1867b, type: 3}
312-
propertyPath: m_LocalEulerAnglesHint.y
313-
value: 0
314-
objectReference: {fileID: 0}
315-
- target: {fileID: 6447137187136765231, guid: 32e66da3044252644bf1e8afdfa1867b, type: 3}
316-
propertyPath: m_LocalEulerAnglesHint.z
317-
value: 0
318-
objectReference: {fileID: 0}
319-
m_RemovedComponents: []
320-
m_SourcePrefab: {fileID: 100100000, guid: 32e66da3044252644bf1e8afdfa1867b, type: 3}
321277
--- !u!114 &576270828 stripped
322278
MonoBehaviour:
323279
m_CorrespondingSourceObject: {fileID: 2030556987656236217, guid: 073f073358c23a643a9bfa14de4556c5, type: 3}
@@ -670,6 +626,35 @@ GameObject:
670626
m_CorrespondingSourceObject: {fileID: 4171595189632753852, guid: 594ce1711b5217f438c8a8137bb9627a, type: 3}
671627
m_PrefabInstance: {fileID: 1321532673}
672628
m_PrefabAsset: {fileID: 0}
629+
--- !u!1001 &1413787732
630+
PrefabInstance:
631+
m_ObjectHideFlags: 0
632+
serializedVersion: 2
633+
m_Modification:
634+
m_TransformParent: {fileID: 0}
635+
m_Modifications:
636+
- target: {fileID: 6447137187136765228, guid: 32e66da3044252644bf1e8afdfa1867b, type: 3}
637+
propertyPath: m_Name
638+
value: Customizable Panel
639+
objectReference: {fileID: 0}
640+
- target: {fileID: 6447137187136765231, guid: 32e66da3044252644bf1e8afdfa1867b, type: 3}
641+
propertyPath: m_RootOrder
642+
value: 1
643+
objectReference: {fileID: 0}
644+
- target: {fileID: 6447137187136765231, guid: 32e66da3044252644bf1e8afdfa1867b, type: 3}
645+
propertyPath: m_LocalEulerAnglesHint.x
646+
value: 0
647+
objectReference: {fileID: 0}
648+
- target: {fileID: 6447137187136765231, guid: 32e66da3044252644bf1e8afdfa1867b, type: 3}
649+
propertyPath: m_LocalEulerAnglesHint.y
650+
value: 0
651+
objectReference: {fileID: 0}
652+
- target: {fileID: 6447137187136765231, guid: 32e66da3044252644bf1e8afdfa1867b, type: 3}
653+
propertyPath: m_LocalEulerAnglesHint.z
654+
value: 0
655+
objectReference: {fileID: 0}
656+
m_RemovedComponents: []
657+
m_SourcePrefab: {fileID: 100100000, guid: 32e66da3044252644bf1e8afdfa1867b, type: 3}
673658
--- !u!1 &1903942790
674659
GameObject:
675660
m_ObjectHideFlags: 0

0 commit comments

Comments
 (0)