Skip to content

Commit 95cdf5f

Browse files
jackbrookesjackbrookes
authored
Merge pull request #13 from immersivecognition/2018-dev
Updated to support 2018.3 and new CamelCase properties
2 parents e77fdb2 + dda9058 commit 95cdf5f

35 files changed

+750
-315
lines changed

‎Assets/DevelopmentScene.unity‎

Lines changed: 54 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -301,197 +301,197 @@ Prefab:
301301
- target: {fileID: 224130118367839794, guid: 0a3b6392f04558844bd340e68ced1ff9,
302302
type: 2}
303303
propertyPath: m_AnchorMax.x
304-
value: 1
304+
value: 0
305305
objectReference: {fileID: 0}
306306
- target: {fileID: 224130118367839794, guid: 0a3b6392f04558844bd340e68ced1ff9,
307307
type: 2}
308308
propertyPath: m_AnchorMax.y
309-
value: 1
309+
value: 0
310310
objectReference: {fileID: 0}
311311
- target: {fileID: 224550780365075244, guid: 0a3b6392f04558844bd340e68ced1ff9,
312312
type: 2}
313313
propertyPath: m_AnchorMax.x
314-
value: 1
314+
value: 0
315315
objectReference: {fileID: 0}
316316
- target: {fileID: 224550780365075244, guid: 0a3b6392f04558844bd340e68ced1ff9,
317317
type: 2}
318318
propertyPath: m_AnchorMax.y
319-
value: 1
319+
value: 0
320320
objectReference: {fileID: 0}
321321
- target: {fileID: 224661754932301978, guid: 0a3b6392f04558844bd340e68ced1ff9,
322322
type: 2}
323323
propertyPath: m_AnchorMin.y
324-
value: 1
324+
value: 0
325325
objectReference: {fileID: 0}
326326
- target: {fileID: 224661754932301978, guid: 0a3b6392f04558844bd340e68ced1ff9,
327327
type: 2}
328328
propertyPath: m_AnchorMax.y
329-
value: 1
329+
value: 0
330330
objectReference: {fileID: 0}
331331
- target: {fileID: 224661754932301978, guid: 0a3b6392f04558844bd340e68ced1ff9,
332332
type: 2}
333333
propertyPath: m_AnchoredPosition.x
334-
value: 182.125
334+
value: 0
335335
objectReference: {fileID: 0}
336336
- target: {fileID: 224661754932301978, guid: 0a3b6392f04558844bd340e68ced1ff9,
337337
type: 2}
338338
propertyPath: m_AnchoredPosition.y
339-
value: -10
339+
value: 0
340340
objectReference: {fileID: 0}
341341
- target: {fileID: 224321436090849264, guid: 0a3b6392f04558844bd340e68ced1ff9,
342342
type: 2}
343343
propertyPath: m_AnchorMin.y
344-
value: 1
344+
value: 0
345345
objectReference: {fileID: 0}
346346
- target: {fileID: 224321436090849264, guid: 0a3b6392f04558844bd340e68ced1ff9,
347347
type: 2}
348348
propertyPath: m_AnchorMax.y
349-
value: 1
349+
value: 0
350350
objectReference: {fileID: 0}
351351
- target: {fileID: 224321436090849264, guid: 0a3b6392f04558844bd340e68ced1ff9,
352352
type: 2}
353353
propertyPath: m_AnchoredPosition.x
354-
value: 521.375
354+
value: 0
355355
objectReference: {fileID: 0}
356356
- target: {fileID: 224321436090849264, guid: 0a3b6392f04558844bd340e68ced1ff9,
357357
type: 2}
358358
propertyPath: m_AnchoredPosition.y
359-
value: -10
359+
value: 0
360360
objectReference: {fileID: 0}
361361
- target: {fileID: 224146843657791948, guid: 0a3b6392f04558844bd340e68ced1ff9,
362362
type: 2}
363363
propertyPath: m_AnchorMin.y
364-
value: 1
364+
value: 0
365365
objectReference: {fileID: 0}
366366
- target: {fileID: 224146843657791948, guid: 0a3b6392f04558844bd340e68ced1ff9,
367367
type: 2}
368368
propertyPath: m_AnchorMax.y
369-
value: 1
369+
value: 0
370370
objectReference: {fileID: 0}
371371
- target: {fileID: 224146843657791948, guid: 0a3b6392f04558844bd340e68ced1ff9,
372372
type: 2}
373373
propertyPath: m_AnchoredPosition.x
374-
value: 860.625
374+
value: 0
375375
objectReference: {fileID: 0}
376376
- target: {fileID: 224146843657791948, guid: 0a3b6392f04558844bd340e68ced1ff9,
377377
type: 2}
378378
propertyPath: m_AnchoredPosition.y
379-
value: -10
379+
value: 0
380380
objectReference: {fileID: 0}
381381
- target: {fileID: 224155073134331500, guid: 0a3b6392f04558844bd340e68ced1ff9,
382382
type: 2}
383383
propertyPath: m_AnchorMin.y
384-
value: 1
384+
value: 0
385385
objectReference: {fileID: 0}
386386
- target: {fileID: 224155073134331500, guid: 0a3b6392f04558844bd340e68ced1ff9,
387387
type: 2}
388388
propertyPath: m_AnchorMax.y
389-
value: 1
389+
value: 0
390390
objectReference: {fileID: 0}
391391
- target: {fileID: 224155073134331500, guid: 0a3b6392f04558844bd340e68ced1ff9,
392392
type: 2}
393393
propertyPath: m_AnchoredPosition.x
394-
value: 1199.875
394+
value: 0
395395
objectReference: {fileID: 0}
396396
- target: {fileID: 224155073134331500, guid: 0a3b6392f04558844bd340e68ced1ff9,
397397
type: 2}
398398
propertyPath: m_AnchoredPosition.y
399-
value: -10
399+
value: 0
400400
objectReference: {fileID: 0}
401401
- target: {fileID: 224231604053429628, guid: 0a3b6392f04558844bd340e68ced1ff9,
402402
type: 2}
403403
propertyPath: m_AnchorMin.y
404-
value: 1
404+
value: 0
405405
objectReference: {fileID: 0}
406406
- target: {fileID: 224231604053429628, guid: 0a3b6392f04558844bd340e68ced1ff9,
407407
type: 2}
408408
propertyPath: m_AnchorMax.y
409-
value: 1
409+
value: 0
410410
objectReference: {fileID: 0}
411411
- target: {fileID: 224231604053429628, guid: 0a3b6392f04558844bd340e68ced1ff9,
412412
type: 2}
413413
propertyPath: m_AnchoredPosition.x
414-
value: 12
414+
value: 0
415415
objectReference: {fileID: 0}
416416
- target: {fileID: 224231604053429628, guid: 0a3b6392f04558844bd340e68ced1ff9,
417417
type: 2}
418418
propertyPath: m_AnchoredPosition.y
419-
value: -10
419+
value: 0
420420
objectReference: {fileID: 0}
421421
- target: {fileID: 224586871144432848, guid: 0a3b6392f04558844bd340e68ced1ff9,
422422
type: 2}
423423
propertyPath: m_AnchorMin.y
424-
value: 1
424+
value: 0
425425
objectReference: {fileID: 0}
426426
- target: {fileID: 224586871144432848, guid: 0a3b6392f04558844bd340e68ced1ff9,
427427
type: 2}
428428
propertyPath: m_AnchorMax.y
429-
value: 1
429+
value: 0
430430
objectReference: {fileID: 0}
431431
- target: {fileID: 224586871144432848, guid: 0a3b6392f04558844bd340e68ced1ff9,
432432
type: 2}
433433
propertyPath: m_AnchoredPosition.x
434-
value: 33
434+
value: 0
435435
objectReference: {fileID: 0}
436436
- target: {fileID: 224586871144432848, guid: 0a3b6392f04558844bd340e68ced1ff9,
437437
type: 2}
438438
propertyPath: m_AnchoredPosition.y
439-
value: -10
439+
value: 0
440440
objectReference: {fileID: 0}
441441
- target: {fileID: 224122663873552442, guid: 0a3b6392f04558844bd340e68ced1ff9,
442442
type: 2}
443443
propertyPath: m_AnchorMin.y
444-
value: 1
444+
value: 0
445445
objectReference: {fileID: 0}
446446
- target: {fileID: 224122663873552442, guid: 0a3b6392f04558844bd340e68ced1ff9,
447447
type: 2}
448448
propertyPath: m_AnchorMax.y
449-
value: 1
449+
value: 0
450450
objectReference: {fileID: 0}
451451
- target: {fileID: 224122663873552442, guid: 0a3b6392f04558844bd340e68ced1ff9,
452452
type: 2}
453453
propertyPath: m_AnchoredPosition.x
454-
value: 12
454+
value: 0
455455
objectReference: {fileID: 0}
456456
- target: {fileID: 224122663873552442, guid: 0a3b6392f04558844bd340e68ced1ff9,
457457
type: 2}
458458
propertyPath: m_AnchoredPosition.y
459-
value: -10
459+
value: 0
460460
objectReference: {fileID: 0}
461461
- target: {fileID: 224977750288414410, guid: 0a3b6392f04558844bd340e68ced1ff9,
462462
type: 2}
463463
propertyPath: m_AnchorMin.y
464-
value: 1
464+
value: 0
465465
objectReference: {fileID: 0}
466466
- target: {fileID: 224977750288414410, guid: 0a3b6392f04558844bd340e68ced1ff9,
467467
type: 2}
468468
propertyPath: m_AnchorMax.y
469-
value: 1
469+
value: 0
470470
objectReference: {fileID: 0}
471471
- target: {fileID: 224977750288414410, guid: 0a3b6392f04558844bd340e68ced1ff9,
472472
type: 2}
473473
propertyPath: m_AnchoredPosition.x
474-
value: 29
474+
value: 0
475475
objectReference: {fileID: 0}
476476
- target: {fileID: 224977750288414410, guid: 0a3b6392f04558844bd340e68ced1ff9,
477477
type: 2}
478478
propertyPath: m_AnchoredPosition.y
479-
value: -10
479+
value: 0
480480
objectReference: {fileID: 0}
481481
- target: {fileID: 224235448540703324, guid: 0a3b6392f04558844bd340e68ced1ff9,
482482
type: 2}
483483
propertyPath: m_AnchorMin.y
484-
value: 1
484+
value: 0
485485
objectReference: {fileID: 0}
486486
- target: {fileID: 224235448540703324, guid: 0a3b6392f04558844bd340e68ced1ff9,
487487
type: 2}
488488
propertyPath: m_AnchorMax.y
489-
value: 1
489+
value: 0
490490
objectReference: {fileID: 0}
491491
- target: {fileID: 224235448540703324, guid: 0a3b6392f04558844bd340e68ced1ff9,
492492
type: 2}
493493
propertyPath: m_AnchoredPosition.x
494-
value: 40.5
494+
value: 0
495495
objectReference: {fileID: 0}
496496
- target: {fileID: 224235448540703324, guid: 0a3b6392f04558844bd340e68ced1ff9,
497497
type: 2}
@@ -501,7 +501,7 @@ Prefab:
501501
- target: {fileID: 224235448540703324, guid: 0a3b6392f04558844bd340e68ced1ff9,
502502
type: 2}
503503
propertyPath: m_SizeDelta.x
504-
value: 81
504+
value: 0
505505
objectReference: {fileID: 0}
506506
- target: {fileID: 224235448540703324, guid: 0a3b6392f04558844bd340e68ced1ff9,
507507
type: 2}
@@ -511,17 +511,17 @@ Prefab:
511511
- target: {fileID: 224025734146448884, guid: 0a3b6392f04558844bd340e68ced1ff9,
512512
type: 2}
513513
propertyPath: m_AnchorMin.y
514-
value: 1
514+
value: 0
515515
objectReference: {fileID: 0}
516516
- target: {fileID: 224025734146448884, guid: 0a3b6392f04558844bd340e68ced1ff9,
517517
type: 2}
518518
propertyPath: m_AnchorMax.y
519-
value: 1
519+
value: 0
520520
objectReference: {fileID: 0}
521521
- target: {fileID: 224025734146448884, guid: 0a3b6392f04558844bd340e68ced1ff9,
522522
type: 2}
523523
propertyPath: m_AnchoredPosition.x
524-
value: 774
524+
value: 0
525525
objectReference: {fileID: 0}
526526
- target: {fileID: 224025734146448884, guid: 0a3b6392f04558844bd340e68ced1ff9,
527527
type: 2}
@@ -531,7 +531,7 @@ Prefab:
531531
- target: {fileID: 224025734146448884, guid: 0a3b6392f04558844bd340e68ced1ff9,
532532
type: 2}
533533
propertyPath: m_SizeDelta.x
534-
value: 1382
534+
value: 0
535535
objectReference: {fileID: 0}
536536
- target: {fileID: 224025734146448884, guid: 0a3b6392f04558844bd340e68ced1ff9,
537537
type: 2}
@@ -541,17 +541,17 @@ Prefab:
541541
- target: {fileID: 224999085726949720, guid: 0a3b6392f04558844bd340e68ced1ff9,
542542
type: 2}
543543
propertyPath: m_AnchorMin.y
544-
value: 1
544+
value: 0
545545
objectReference: {fileID: 0}
546546
- target: {fileID: 224999085726949720, guid: 0a3b6392f04558844bd340e68ced1ff9,
547547
type: 2}
548548
propertyPath: m_AnchorMax.y
549-
value: 1
549+
value: 0
550550
objectReference: {fileID: 0}
551551
- target: {fileID: 224999085726949720, guid: 0a3b6392f04558844bd340e68ced1ff9,
552552
type: 2}
553553
propertyPath: m_AnchoredPosition.x
554-
value: 1503.5
554+
value: 0
555555
objectReference: {fileID: 0}
556556
- target: {fileID: 224999085726949720, guid: 0a3b6392f04558844bd340e68ced1ff9,
557557
type: 2}
@@ -561,7 +561,7 @@ Prefab:
561561
- target: {fileID: 224999085726949720, guid: 0a3b6392f04558844bd340e68ced1ff9,
562562
type: 2}
563563
propertyPath: m_SizeDelta.x
564-
value: 73
564+
value: 0
565565
objectReference: {fileID: 0}
566566
- target: {fileID: 224999085726949720, guid: 0a3b6392f04558844bd340e68ced1ff9,
567567
type: 2}
@@ -571,66 +571,36 @@ Prefab:
571571
- target: {fileID: 224286096967890162, guid: 0a3b6392f04558844bd340e68ced1ff9,
572572
type: 2}
573573
propertyPath: m_AnchorMin.y
574-
value: 1
574+
value: 0
575575
objectReference: {fileID: 0}
576576
- target: {fileID: 224286096967890162, guid: 0a3b6392f04558844bd340e68ced1ff9,
577577
type: 2}
578578
propertyPath: m_AnchorMax.y
579-
value: 1
579+
value: 0
580580
objectReference: {fileID: 0}
581581
- target: {fileID: 224286096967890162, guid: 0a3b6392f04558844bd340e68ced1ff9,
582582
type: 2}
583583
propertyPath: m_AnchoredPosition.x
584-
value: 164
584+
value: 0
585585
objectReference: {fileID: 0}
586586
- target: {fileID: 224286096967890162, guid: 0a3b6392f04558844bd340e68ced1ff9,
587587
type: 2}
588588
propertyPath: m_SizeDelta.x
589-
value: 318
589+
value: 0
590590
objectReference: {fileID: 0}
591591
- target: {fileID: 224546371281550106, guid: 0a3b6392f04558844bd340e68ced1ff9,
592592
type: 2}
593593
propertyPath: m_SizeDelta.y
594-
value: 75
594+
value: 0
595595
objectReference: {fileID: 0}
596596
- target: {fileID: 224487761690423894, guid: 0a3b6392f04558844bd340e68ced1ff9,
597597
type: 2}
598598
propertyPath: m_SizeDelta.y
599-
value: 5
600-
objectReference: {fileID: 0}
601-
- target: {fileID: 224146843657791948, guid: 0a3b6392f04558844bd340e68ced1ff9,
602-
type: 2}
603-
propertyPath: m_RootOrder
604-
value: 2
605-
objectReference: {fileID: 0}
606-
- target: {fileID: 224155073134331500, guid: 0a3b6392f04558844bd340e68ced1ff9,
607-
type: 2}
608-
propertyPath: m_RootOrder
609-
value: 3
610-
objectReference: {fileID: 0}
611-
- target: {fileID: 224321436090849264, guid: 0a3b6392f04558844bd340e68ced1ff9,
612-
type: 2}
613-
propertyPath: m_RootOrder
614-
value: 1
615-
objectReference: {fileID: 0}
616-
- target: {fileID: 1321011041162378, guid: 0a3b6392f04558844bd340e68ced1ff9, type: 2}
617-
propertyPath: m_Name
618-
value: Folder
599+
value: 0
619600
objectReference: {fileID: 0}
620-
- target: {fileID: 114543364493683420, guid: 0a3b6392f04558844bd340e68ced1ff9,
621-
type: 2}
622-
propertyPath: folder
623-
value:
624-
objectReference: {fileID: 1214648920}
625601
m_RemovedComponents: []
626602
m_ParentPrefab: {fileID: 100100000, guid: 0a3b6392f04558844bd340e68ced1ff9, type: 2}
627603
m_IsPrefabParent: 0
628-
--- !u!114 &1214648920 stripped
629-
MonoBehaviour:
630-
m_PrefabParentObject: {fileID: 114531160504100936, guid: 0a3b6392f04558844bd340e68ced1ff9,
631-
type: 2}
632-
m_PrefabInternal: {fileID: 1214648919}
633-
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
634604
--- !u!1 &1538133409
635605
GameObject:
636606
m_ObjectHideFlags: 0

0 commit comments

Comments
 (0)