Skip to content

Commit 0f91f47

Browse files
authored
Merge pull request #20 from immersivecognition/dev
Merged dev branch
2 parents e6f4a62 + 7ada797 commit 0f91f47

File tree

7 files changed

+1177
-29
lines changed

7 files changed

+1177
-29
lines changed

Assets/DevelopmentScene.unity

Lines changed: 71 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -298,6 +298,26 @@ Prefab:
298298
propertyPath: m_RootOrder
299299
value: 2
300300
objectReference: {fileID: 0}
301+
- target: {fileID: 224828505565134240, guid: 0a3b6392f04558844bd340e68ced1ff9,
302+
type: 2}
303+
propertyPath: m_AnchorMax.x
304+
value: 0
305+
objectReference: {fileID: 0}
306+
- target: {fileID: 224828505565134240, guid: 0a3b6392f04558844bd340e68ced1ff9,
307+
type: 2}
308+
propertyPath: m_AnchorMax.y
309+
value: 0
310+
objectReference: {fileID: 0}
311+
- target: {fileID: 224249442015162520, guid: 0a3b6392f04558844bd340e68ced1ff9,
312+
type: 2}
313+
propertyPath: m_AnchorMax.x
314+
value: 0
315+
objectReference: {fileID: 0}
316+
- target: {fileID: 224249442015162520, guid: 0a3b6392f04558844bd340e68ced1ff9,
317+
type: 2}
318+
propertyPath: m_AnchorMax.y
319+
value: 0
320+
objectReference: {fileID: 0}
301321
- target: {fileID: 224550780365075244, guid: 0a3b6392f04558844bd340e68ced1ff9,
302322
type: 2}
303323
propertyPath: m_AnchorMax.x
@@ -318,6 +338,16 @@ Prefab:
318338
propertyPath: m_AnchorMax.y
319339
value: 0
320340
objectReference: {fileID: 0}
341+
- target: {fileID: 224259391500212076, guid: 0a3b6392f04558844bd340e68ced1ff9,
342+
type: 2}
343+
propertyPath: m_SizeDelta.x
344+
value: 0
345+
objectReference: {fileID: 0}
346+
- target: {fileID: 224259391500212076, guid: 0a3b6392f04558844bd340e68ced1ff9,
347+
type: 2}
348+
propertyPath: m_SizeDelta.y
349+
value: 0
350+
objectReference: {fileID: 0}
321351
- target: {fileID: 224122663873552442, guid: 0a3b6392f04558844bd340e68ced1ff9,
322352
type: 2}
323353
propertyPath: m_AnchorMin.y
@@ -568,7 +598,42 @@ Prefab:
568598
propertyPath: m_SizeDelta.y
569599
value: 0
570600
objectReference: {fileID: 0}
571-
- target: {fileID: 224487761690423894, guid: 0a3b6392f04558844bd340e68ced1ff9,
601+
- target: {fileID: 224696896671577696, guid: 0a3b6392f04558844bd340e68ced1ff9,
602+
type: 2}
603+
propertyPath: m_AnchorMax.x
604+
value: 0
605+
objectReference: {fileID: 0}
606+
- target: {fileID: 224696896671577696, guid: 0a3b6392f04558844bd340e68ced1ff9,
607+
type: 2}
608+
propertyPath: m_AnchorMax.y
609+
value: 0
610+
objectReference: {fileID: 0}
611+
- target: {fileID: 224696896671577696, guid: 0a3b6392f04558844bd340e68ced1ff9,
612+
type: 2}
613+
propertyPath: m_SizeDelta.x
614+
value: 0
615+
objectReference: {fileID: 0}
616+
- target: {fileID: 224696896671577696, guid: 0a3b6392f04558844bd340e68ced1ff9,
617+
type: 2}
618+
propertyPath: m_SizeDelta.y
619+
value: 0
620+
objectReference: {fileID: 0}
621+
- target: {fileID: 224444909738358554, guid: 0a3b6392f04558844bd340e68ced1ff9,
622+
type: 2}
623+
propertyPath: m_AnchorMax.x
624+
value: 0
625+
objectReference: {fileID: 0}
626+
- target: {fileID: 224444909738358554, guid: 0a3b6392f04558844bd340e68ced1ff9,
627+
type: 2}
628+
propertyPath: m_SizeDelta.x
629+
value: 0
630+
objectReference: {fileID: 0}
631+
- target: {fileID: 224915196345323170, guid: 0a3b6392f04558844bd340e68ced1ff9,
632+
type: 2}
633+
propertyPath: m_AnchorMax.y
634+
value: 0
635+
objectReference: {fileID: 0}
636+
- target: {fileID: 224915196345323170, guid: 0a3b6392f04558844bd340e68ced1ff9,
572637
type: 2}
573638
propertyPath: m_SizeDelta.y
574639
value: 0
@@ -598,6 +663,11 @@ Prefab:
598663
propertyPath: m_SizeDelta.y
599664
value: 0
600665
objectReference: {fileID: 0}
666+
- target: {fileID: 224487761690423894, guid: 0a3b6392f04558844bd340e68ced1ff9,
667+
type: 2}
668+
propertyPath: m_SizeDelta.y
669+
value: 0
670+
objectReference: {fileID: 0}
601671
m_RemovedComponents: []
602672
m_ParentPrefab: {fileID: 100100000, guid: 0a3b6392f04558844bd340e68ced1ff9, type: 2}
603673
m_IsPrefabParent: 0
111 KB
Binary file not shown.

Assets/UXF/Fonts/RobotoMono-Regular.ttf.meta

Lines changed: 21 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)