Crowmate/HeadlessHazard
7
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Resolve merge conflicts using incoming branch

Browse Source
This commit is contained in:
Antoine Papillon
2026-03-16 11:32:15 +01:00
parent e3852c7f60 7a281dcb6c
commit d906c93460
8 changed files with 212 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Assets/Level/Scenes/DevRoom.unity
View File

@@ -5577,7 +5577,7 @@ GameObject:
- component: {fileID: 1173887971}
- component: {fileID: 1173887970}
- component: {fileID: 1173887969}
m_Layer: 0
m_Layer: 3
m_Name: Plate
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -7285,7 +7285,7 @@ GameObject:
- component: {fileID: 1524676968}
- component: {fileID: 1524676967}
- component: {fileID: 1524676966}
m_Layer: 0
m_Layer: 3
m_Name: Plate
m_TagString: Untagged
m_Icon: {fileID: 0}