Merge branch 'Add-New-Modules' of https://git.uwaterloo.ca/capstone-group2/ui into Add-New-Modules

This commit is contained in:
Christen
2026-03-03 19:28:47 -05:00
434 changed files with 3671 additions and 49577 deletions

View File

@@ -122,7 +122,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 7397659539795428015, guid: ff94de509dce74d96bc3d1e8d35c56a7, type: 3}
- {fileID: 2100000, guid: 66bb025986bd66c479f0fe7e007798b0, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@@ -234,7 +234,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 7397659539795428015, guid: 4ab1ba74d3fd045f0a6d3d2b6451892b, type: 3}
- {fileID: 2100000, guid: 66bb025986bd66c479f0fe7e007798b0, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@@ -304,7 +304,7 @@ Transform:
m_GameObject: {fileID: 8525483865450655611}
serializedVersion: 2
m_LocalRotation: {x: 0.5, y: 0.5, z: -0.5, w: 0.5}
m_LocalPosition: {x: -0.01608, y: 0.01436, z: 0.0567}
m_LocalPosition: {x: -0.01608, y: 0.01436, z: 0.0609}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@@ -377,7 +377,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 7397659539795428015, guid: 4ab1ba74d3fd045f0a6d3d2b6451892b, type: 3}
- {fileID: 2100000, guid: 66bb025986bd66c479f0fe7e007798b0, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0