Merge pull request #87 from Kariaro/develop

Develop
Kariaro · May 9, 2023 · 1b3a415 · 1b3a415
2 parents 3463207 + 040377c
commit 1b3a415
Show file tree

Hide file tree

Showing 160 changed files with 7,356 additions and 6,091 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -6,6 +6,8 @@ on:
       tag:
         type: string
         default: v0.10.1-macos11
+      ref:
+        type: string
     secrets:
       unityLicense:
         required: true
@@ -25,6 +27,8 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
+        with:
+          ref: ${{ inputs.ref }}
 
       - name: Download libs
         run: bash download_libs.sh "${{ inputs.tag }}"

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -12,6 +12,7 @@ jobs:
     uses: ./.github/workflows/build.yml
     with:
       tag: ${{ inputs.tag }}
+      ref: ${{ github.event.ref }}
     secrets:
       unityLicense: ${{ secrets.UNITY_LICENSE }}
       githubToken: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -1,11 +1,24 @@
 name: Push Checks
 
 on:
-  pull_request: {}
+  push: {}
+  pull_request_target:
+     types: labeled
 jobs:
+  check-test-trigger:
+    runs-on: ubuntu-latest
+    if: github.event_name == 'push' || contains(github.event.pull_request.labels.*.name, 'ci:run')
+    steps:
+      - uses: actions-ecosystem/action-remove-labels@v1
+        if: contains(github.event.pull_request.labels.*.name, 'ci:run')
+        with:
+          labels: ci:run
   builds:
     name: Builds
     uses: ./.github/workflows/build.yml
+    needs: check-test-trigger
+    with:
+      ref: ${{ github.event.pull_request.head.sha }}
     secrets:
       unityLicense: ${{ secrets.UNITY_LICENSE }}
       githubToken: ${{ secrets.GITHUB_TOKEN }}
diff --git a/Assets/Scenes/Debugging/GUI/GUIDebugWorkspace.unity b/Assets/Scenes/Debugging/GUI/GUIDebugWorkspace.unity
@@ -134,7 +134,6 @@ GameObject:
   - component: {fileID: 275874967}
   - component: {fileID: 275874978}
   - component: {fileID: 275874975}
-  - component: {fileID: 275874970}
   - component: {fileID: 275874977}
   - component: {fileID: 275874973}
   m_Layer: 0
@@ -159,19 +158,6 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &275874970
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 275874966}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: d5da564da19cb6b7d8e4f97f269edc5d, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  _poolSize: 10
 --- !u!114 &275874973
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -226,7 +212,6 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   graphRunner: {fileID: 275874975}
-  textureFramePool: {fileID: 275874970}
   defaultVrmModel: {fileID: 1321532676}
   defaultVrmPrefab: {fileID: 4171595189632753852, guid: 594ce1711b5217f438c8a8137bb9627a, type: 3}
   defaultController: {fileID: 9100000, guid: 5d9fb0b38102bfa4381749fecd7d9df6, type: 2}

diff --git a/Assets/Scenes/Debugging/Hands/HandDebugWorkspace.unity b/Assets/Scenes/Debugging/Hands/HandDebugWorkspace.unity
@@ -139,7 +139,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!114 &246612463
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -185,7 +185,6 @@ GameObject:
   - component: {fileID: 275874967}
   - component: {fileID: 275874978}
   - component: {fileID: 275874975}
-  - component: {fileID: 275874970}
   - component: {fileID: 275874977}
   - component: {fileID: 275874973}
   m_Layer: 0
@@ -211,19 +210,6 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &275874970
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 275874966}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: d5da564da19cb6b7d8e4f97f269edc5d, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  _poolSize: 10
 --- !u!114 &275874973
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -278,7 +264,6 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   graphRunner: {fileID: 275874975}
-  textureFramePool: {fileID: 275874970}
   defaultVrmModel: {fileID: 1321532676}
   defaultVrmPrefab: {fileID: 4171595189632753852, guid: 594ce1711b5217f438c8a8137bb9627a, type: 3}
   defaultController: {fileID: 9100000, guid: 5d9fb0b38102bfa4381749fecd7d9df6, type: 2}
@@ -289,35 +274,6 @@ MonoBehaviour:
   fps: 60
   renderUpdate: 0
   meshObject: {fileID: 1993461921}
---- !u!1001 &548834500
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: 6447137187136765228, guid: 32e66da3044252644bf1e8afdfa1867b, type: 3}
-      propertyPath: m_Name
-      value: Customizable Panel
-      objectReference: {fileID: 0}
-    - target: {fileID: 6447137187136765231, guid: 32e66da3044252644bf1e8afdfa1867b, type: 3}
-      propertyPath: m_RootOrder
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 6447137187136765231, guid: 32e66da3044252644bf1e8afdfa1867b, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6447137187136765231, guid: 32e66da3044252644bf1e8afdfa1867b, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6447137187136765231, guid: 32e66da3044252644bf1e8afdfa1867b, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 32e66da3044252644bf1e8afdfa1867b, type: 3}
 --- !u!114 &576270828 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 2030556987656236217, guid: 073f073358c23a643a9bfa14de4556c5, type: 3}
@@ -670,6 +626,35 @@ GameObject:
   m_CorrespondingSourceObject: {fileID: 4171595189632753852, guid: 594ce1711b5217f438c8a8137bb9627a, type: 3}
   m_PrefabInstance: {fileID: 1321532673}
   m_PrefabAsset: {fileID: 0}
+--- !u!1001 &1413787732
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 6447137187136765228, guid: 32e66da3044252644bf1e8afdfa1867b, type: 3}
+      propertyPath: m_Name
+      value: Customizable Panel
+      objectReference: {fileID: 0}
+    - target: {fileID: 6447137187136765231, guid: 32e66da3044252644bf1e8afdfa1867b, type: 3}
+      propertyPath: m_RootOrder
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6447137187136765231, guid: 32e66da3044252644bf1e8afdfa1867b, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6447137187136765231, guid: 32e66da3044252644bf1e8afdfa1867b, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6447137187136765231, guid: 32e66da3044252644bf1e8afdfa1867b, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 32e66da3044252644bf1e8afdfa1867b, type: 3}
 --- !u!1 &1903942790
 GameObject:
   m_ObjectHideFlags: 0