Skip to content

Commit 4b9be35

Browse files
dbirmandbirman
committed
Merge branch 'develop' of https://github.com/VirtualBrainLab/Pinpoint into develop
2 parents 2b63f46 + b7f2b1a commit 4b9be35

File tree

10 files changed

+213
-201
lines changed

10 files changed

+213
-201
lines changed

Assets/Prefabs/UI/EphysCopilot/EphysCopilotPanel.prefab renamed to Assets/Prefabs/UI/EphysCopilot/CopilotPanel.prefab

Lines changed: 5 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ RectTransform:
3333
m_Children:
3434
- {fileID: 8889801261066149662}
3535
m_Father: {fileID: 3171181750794952356}
36-
m_RootOrder: 1
3736
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
3837
m_AnchorMin: {x: 1, y: 0}
3938
m_AnchorMax: {x: 1, y: 1}
@@ -157,7 +156,6 @@ RectTransform:
157156
m_Children:
158157
- {fileID: 8361295466311985757}
159158
m_Father: {fileID: 4801885216323290213}
160-
m_RootOrder: 0
161159
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
162160
m_AnchorMin: {x: 0, y: 0}
163161
m_AnchorMax: {x: 1, y: 1}
@@ -199,7 +197,6 @@ RectTransform:
199197
- {fileID: 7761443917104768108}
200198
- {fileID: 6542992911101263224}
201199
m_Father: {fileID: 3208185261194632028}
202-
m_RootOrder: 1
203200
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
204201
m_AnchorMin: {x: 0, y: 0}
205202
m_AnchorMax: {x: 0, y: 0}
@@ -325,7 +322,6 @@ RectTransform:
325322
m_ConstrainProportionsScale: 0
326323
m_Children: []
327324
m_Father: {fileID: 1828645389624930458}
328-
m_RootOrder: 0
329325
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
330326
m_AnchorMin: {x: 0, y: 0}
331327
m_AnchorMax: {x: 0, y: 0}
@@ -462,7 +458,6 @@ RectTransform:
462458
m_ConstrainProportionsScale: 0
463459
m_Children: []
464460
m_Father: {fileID: 1445278465893963706}
465-
m_RootOrder: 0
466461
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
467462
m_AnchorMin: {x: 0, y: 0}
468463
m_AnchorMax: {x: 0, y: 0}
@@ -580,7 +575,7 @@ GameObject:
580575
- component: {fileID: 1445278465348587323}
581576
- component: {fileID: 5483421187078802668}
582577
m_Layer: 5
583-
m_Name: EphysCopilotPanel
578+
m_Name: CopilotPanel
584579
m_TagString: Untagged
585580
m_Icon: {fileID: 0}
586581
m_NavMeshLayer: 0
@@ -603,7 +598,6 @@ RectTransform:
603598
- {fileID: 1828645389624930458}
604599
- {fileID: 2443275810401281638}
605600
m_Father: {fileID: 0}
606-
m_RootOrder: 0
607601
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
608602
m_AnchorMin: {x: 0.5, y: 0}
609603
m_AnchorMax: {x: 0.5, y: 0}
@@ -699,7 +693,6 @@ RectTransform:
699693
- {fileID: 1445278465210223969}
700694
- {fileID: 1980688578011265982}
701695
m_Father: {fileID: 1445278465348587320}
702-
m_RootOrder: 0
703696
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
704697
m_AnchorMin: {x: 0, y: 0}
705698
m_AnchorMax: {x: 0, y: 0}
@@ -821,7 +814,6 @@ RectTransform:
821814
m_ConstrainProportionsScale: 0
822815
m_Children: []
823816
m_Father: {fileID: 1253443420063400270}
824-
m_RootOrder: 0
825817
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
826818
m_AnchorMin: {x: 0, y: 0}
827819
m_AnchorMax: {x: 0, y: 0}
@@ -899,7 +891,6 @@ RectTransform:
899891
m_Children:
900892
- {fileID: 1398402113872163574}
901893
m_Father: {fileID: 5847460939056171599}
902-
m_RootOrder: 1
903894
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
904895
m_AnchorMin: {x: 1, y: 0}
905896
m_AnchorMax: {x: 1, y: 1}
@@ -1026,7 +1017,6 @@ RectTransform:
10261017
m_Children:
10271018
- {fileID: 1023112252082091778}
10281019
m_Father: {fileID: 1871767357751830342}
1029-
m_RootOrder: 0
10301020
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
10311021
m_AnchorMin: {x: 0, y: 0}
10321022
m_AnchorMax: {x: 0, y: 0}
@@ -1115,7 +1105,6 @@ RectTransform:
11151105
m_ConstrainProportionsScale: 0
11161106
m_Children: []
11171107
m_Father: {fileID: 1398402113872163574}
1118-
m_RootOrder: 0
11191108
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
11201109
m_AnchorMin: {x: 0, y: 0}
11211110
m_AnchorMax: {x: 0, y: 0}
@@ -1195,7 +1184,6 @@ RectTransform:
11951184
- {fileID: 3433957872760773670}
11961185
- {fileID: 2787641372150023568}
11971186
m_Father: {fileID: 2443275810401281638}
1198-
m_RootOrder: 1
11991187
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
12001188
m_AnchorMin: {x: 0, y: 0}
12011189
m_AnchorMax: {x: 0, y: 0}
@@ -1325,7 +1313,6 @@ RectTransform:
13251313
- {fileID: 3100601276906428472}
13261314
- {fileID: 7177960168083237365}
13271315
m_Father: {fileID: 1445278465893963706}
1328-
m_RootOrder: 1
13291316
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
13301317
m_AnchorMin: {x: 0, y: 0}
13311318
m_AnchorMax: {x: 0, y: 0}
@@ -1450,7 +1437,6 @@ RectTransform:
14501437
m_Children:
14511438
- {fileID: 604587447986236897}
14521439
m_Father: {fileID: 6542992911101263224}
1453-
m_RootOrder: 0
14541440
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
14551441
m_AnchorMin: {x: 0, y: 0}
14561442
m_AnchorMax: {x: 1, y: 1}
@@ -1490,7 +1476,6 @@ RectTransform:
14901476
m_Children:
14911477
- {fileID: 7730571946973758776}
14921478
m_Father: {fileID: 1980688578011265982}
1493-
m_RootOrder: 0
14941479
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
14951480
m_AnchorMin: {x: 0, y: 0}
14961481
m_AnchorMax: {x: 0, y: 0}
@@ -1578,7 +1563,6 @@ RectTransform:
15781563
m_Children:
15791564
- {fileID: 3068108255336848725}
15801565
m_Father: {fileID: 2787641372150023568}
1581-
m_RootOrder: 0
15821566
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
15831567
m_AnchorMin: {x: 0, y: 0}
15841568
m_AnchorMax: {x: 1, y: 1}
@@ -1620,7 +1604,6 @@ RectTransform:
16201604
- {fileID: 3686407937574207330}
16211605
- {fileID: 1871767357751830342}
16221606
m_Father: {fileID: 1445278465348587320}
1623-
m_RootOrder: 1
16241607
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
16251608
m_AnchorMin: {x: 0, y: 0}
16261609
m_AnchorMax: {x: 0, y: 0}
@@ -1741,7 +1724,6 @@ RectTransform:
17411724
m_Children:
17421725
- {fileID: 538386439288270413}
17431726
m_Father: {fileID: 7177960168083237365}
1744-
m_RootOrder: 0
17451727
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
17461728
m_AnchorMin: {x: 0, y: 0}
17471729
m_AnchorMax: {x: 1, y: 1}
@@ -1779,11 +1761,10 @@ RectTransform:
17791761
m_ConstrainProportionsScale: 0
17801762
m_Children: []
17811763
m_Father: {fileID: 3433957872760773670}
1782-
m_RootOrder: 0
17831764
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
17841765
m_AnchorMin: {x: 0, y: 1}
17851766
m_AnchorMax: {x: 1, y: 1}
1786-
m_AnchoredPosition: {x: 0, y: -58.592503}
1767+
m_AnchoredPosition: {x: 0, y: 1160.4506}
17871768
m_SizeDelta: {x: 0, y: 0}
17881769
m_Pivot: {x: 0, y: 1}
17891770
--- !u!114 &5868928366586953604
@@ -1857,7 +1838,6 @@ RectTransform:
18571838
m_ConstrainProportionsScale: 0
18581839
m_Children: []
18591840
m_Father: {fileID: 2443275810401281638}
1860-
m_RootOrder: 0
18611841
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
18621842
m_AnchorMin: {x: 0, y: 0}
18631843
m_AnchorMax: {x: 0, y: 0}
@@ -1994,7 +1974,6 @@ RectTransform:
19941974
m_ConstrainProportionsScale: 0
19951975
m_Children: []
19961976
m_Father: {fileID: 5274807102475215754}
1997-
m_RootOrder: 0
19981977
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
19991978
m_AnchorMin: {x: 0, y: 0}
20001979
m_AnchorMax: {x: 0, y: 0}
@@ -2070,7 +2049,6 @@ RectTransform:
20702049
m_ConstrainProportionsScale: 0
20712050
m_Children: []
20722051
m_Father: {fileID: 3208185261194632028}
2073-
m_RootOrder: 0
20742052
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
20752053
m_AnchorMin: {x: 0, y: 0}
20762054
m_AnchorMax: {x: 0, y: 0}
@@ -2211,7 +2189,6 @@ RectTransform:
22112189
- {fileID: 6891135516417237052}
22122190
- {fileID: 4801885216323290213}
22132191
m_Father: {fileID: 1828645389624930458}
2214-
m_RootOrder: 1
22152192
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
22162193
m_AnchorMin: {x: 0, y: 0}
22172194
m_AnchorMax: {x: 0, y: 0}
@@ -2339,7 +2316,6 @@ RectTransform:
23392316
m_Children:
23402317
- {fileID: 5274807102475215754}
23412318
m_Father: {fileID: 1871767357751830342}
2342-
m_RootOrder: 1
23432319
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
23442320
m_AnchorMin: {x: 1, y: 0}
23452321
m_AnchorMax: {x: 1, y: 1}
@@ -2464,7 +2440,6 @@ RectTransform:
24642440
m_ConstrainProportionsScale: 0
24652441
m_Children: []
24662442
m_Father: {fileID: 8889801261066149662}
2467-
m_RootOrder: 0
24682443
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
24692444
m_AnchorMin: {x: 0, y: 0}
24702445
m_AnchorMax: {x: 0, y: 0}
@@ -2540,11 +2515,10 @@ RectTransform:
25402515
m_ConstrainProportionsScale: 0
25412516
m_Children: []
25422517
m_Father: {fileID: 3100601276906428472}
2543-
m_RootOrder: 0
25442518
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
25452519
m_AnchorMin: {x: 0, y: 1}
25462520
m_AnchorMax: {x: 1, y: 1}
2547-
m_AnchoredPosition: {x: 0, y: -58.592503}
2521+
m_AnchoredPosition: {x: 0, y: 1160.4506}
25482522
m_SizeDelta: {x: 0, y: 0}
25492523
m_Pivot: {x: 0, y: 1}
25502524
--- !u!114 &4506754816824710980
@@ -2618,11 +2592,10 @@ RectTransform:
26182592
m_ConstrainProportionsScale: 0
26192593
m_Children: []
26202594
m_Father: {fileID: 7761443917104768108}
2621-
m_RootOrder: 0
26222595
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
26232596
m_AnchorMin: {x: 0, y: 1}
26242597
m_AnchorMax: {x: 1, y: 1}
2625-
m_AnchoredPosition: {x: 0, y: -58.592472}
2598+
m_AnchoredPosition: {x: 0, y: 1160.4506}
26262599
m_SizeDelta: {x: 0, y: 0}
26272600
m_Pivot: {x: 0, y: 1}
26282601
--- !u!114 &5987856609131885523
@@ -2700,7 +2673,6 @@ RectTransform:
27002673
- {fileID: 1329200430980672766}
27012674
- {fileID: 3171181750794952356}
27022675
m_Father: {fileID: 1445278465348587320}
2703-
m_RootOrder: 2
27042676
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
27052677
m_AnchorMin: {x: 0, y: 0}
27062678
m_AnchorMax: {x: 0, y: 0}
@@ -2824,7 +2796,6 @@ RectTransform:
28242796
m_Children:
28252797
- {fileID: 6126481738209059470}
28262798
m_Father: {fileID: 5847460939056171599}
2827-
m_RootOrder: 0
28282799
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
28292800
m_AnchorMin: {x: 0, y: 0}
28302801
m_AnchorMax: {x: 0, y: 0}
@@ -2915,7 +2886,6 @@ RectTransform:
29152886
m_Children:
29162887
- {fileID: 1253443420063400270}
29172888
m_Father: {fileID: 1980688578011265982}
2918-
m_RootOrder: 1
29192889
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
29202890
m_AnchorMin: {x: 1, y: 0}
29212891
m_AnchorMax: {x: 1, y: 1}
@@ -3044,7 +3014,6 @@ RectTransform:
30443014
- {fileID: 2392387104559285655}
30453015
- {fileID: 5847460939056171599}
30463016
m_Father: {fileID: 1445278465348587320}
3047-
m_RootOrder: 3
30483017
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
30493018
m_AnchorMin: {x: 0, y: 0}
30503019
m_AnchorMax: {x: 0, y: 0}
@@ -3166,11 +3135,10 @@ RectTransform:
31663135
m_ConstrainProportionsScale: 0
31673136
m_Children: []
31683137
m_Father: {fileID: 6891135516417237052}
3169-
m_RootOrder: 0
31703138
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
31713139
m_AnchorMin: {x: 0, y: 1}
31723140
m_AnchorMax: {x: 1, y: 1}
3173-
m_AnchoredPosition: {x: 0, y: -58.592503}
3141+
m_AnchoredPosition: {x: 0, y: 1160.4506}
31743142
m_SizeDelta: {x: 0, y: 0}
31753143
m_Pivot: {x: 0, y: 1}
31763144
--- !u!114 &2245757367060331119
@@ -3246,7 +3214,6 @@ RectTransform:
32463214
m_Children:
32473215
- {fileID: 4053970164101770309}
32483216
m_Father: {fileID: 3171181750794952356}
3249-
m_RootOrder: 0
32503217
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
32513218
m_AnchorMin: {x: 0, y: 0}
32523219
m_AnchorMax: {x: 0, y: 0}

Assets/Prefabs/UI/EphysCopilot/EphysCopilotPanel.prefab.meta renamed to Assets/Prefabs/UI/EphysCopilot/CopilotPanel.prefab.meta

File renamed without changes.

0 commit comments

Comments
 (0)