Skip to content

Merged dev branch #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Oct 16, 2018
Merged

Merged dev branch #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
56a3aa1
added info bar
jackbrookes Oct 14, 2018
4350e26
fixed return functionality
jackbrookes Oct 16, 2018
16ecc42
better checkbox functionality
jackbrookes Oct 16, 2018
7a32554
now includes the directory as a base header
jackbrookes Oct 16, 2018
55299bb
now includes the directory as a base header, changed tracker header
jackbrookes Oct 16, 2018
1d6adee
Merge branch 'development' of https://github.com/jackbrookes/unity-ex…
jackbrookes Oct 16, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
388 changes: 319 additions & 69 deletions Assets/DevelopmentScene.unity
View file
Open in desktop

Large diffs are not rendered by default.

305 changes: 303 additions & 2 deletions Assets/UXF/Examples/Advanced/AdvancedExample.unity
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -439,6 +439,22 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 0}
--- !u!1 &772481549 stripped
GameObject:
m_PrefabParentObject: {fileID: 1232849728441532, guid: 0a3b6392f04558844bd340e68ced1ff9,
type: 2}
m_PrefabInternal: {fileID: 1212509306}
--- !u!114 &772481554
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 772481549}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 51f945e5620a8ab47bd508d682077a50, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &973809109
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -666,7 +682,7 @@ Prefab:
- target: {fileID: 224546371281550106, guid: 0a3b6392f04558844bd340e68ced1ff9,
type: 2}
propertyPath: m_SizeDelta.y
value: 75
value: 0
objectReference: {fileID: 0}
- target: {fileID: 114916036141644208, guid: 0a3b6392f04558844bd340e68ced1ff9,
type: 2}
Expand Down Expand Up @@ -978,6 +994,291 @@ Prefab:
propertyPath: onSessionEnd.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
value: UnityEngine.Object, UnityEngine
objectReference: {fileID: 0}
- target: {fileID: 224550780365075244, guid: 0a3b6392f04558844bd340e68ced1ff9,
type: 2}
propertyPath: m_AnchorMax.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 224550780365075244, guid: 0a3b6392f04558844bd340e68ced1ff9,
type: 2}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 224231604053429628, guid: 0a3b6392f04558844bd340e68ced1ff9,
type: 2}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 224231604053429628, guid: 0a3b6392f04558844bd340e68ced1ff9,
type: 2}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 224231604053429628, guid: 0a3b6392f04558844bd340e68ced1ff9,
type: 2}
propertyPath: m_AnchoredPosition.x
value: 12
objectReference: {fileID: 0}
- target: {fileID: 224231604053429628, guid: 0a3b6392f04558844bd340e68ced1ff9,
type: 2}
propertyPath: m_AnchoredPosition.y
value: -10
objectReference: {fileID: 0}
- target: {fileID: 224586871144432848, guid: 0a3b6392f04558844bd340e68ced1ff9,
type: 2}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 224586871144432848, guid: 0a3b6392f04558844bd340e68ced1ff9,
type: 2}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 224586871144432848, guid: 0a3b6392f04558844bd340e68ced1ff9,
type: 2}
propertyPath: m_AnchoredPosition.x
value: 33
objectReference: {fileID: 0}
- target: {fileID: 224586871144432848, guid: 0a3b6392f04558844bd340e68ced1ff9,
type: 2}
propertyPath: m_AnchoredPosition.y
value: -10
objectReference: {fileID: 0}
- target: {fileID: 224122663873552442, guid: 0a3b6392f04558844bd340e68ced1ff9,
type: 2}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 224122663873552442, guid: 0a3b6392f04558844bd340e68ced1ff9,
type: 2}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 224122663873552442, guid: 0a3b6392f04558844bd340e68ced1ff9,
type: 2}
propertyPath: m_AnchoredPosition.x
value: 12
objectReference: {fileID: 0}
- target: {fileID: 224122663873552442, guid: 0a3b6392f04558844bd340e68ced1ff9,
type: 2}
propertyPath: m_AnchoredPosition.y
value: -10
objectReference: {fileID: 0}
- target: {fileID: 224977750288414410, guid: 0a3b6392f04558844bd340e68ced1ff9,
type: 2}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 224977750288414410, guid: 0a3b6392f04558844bd340e68ced1ff9,
type: 2}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 224977750288414410, guid: 0a3b6392f04558844bd340e68ced1ff9,
type: 2}
propertyPath: m_AnchoredPosition.x
value: 29
objectReference: {fileID: 0}
- target: {fileID: 224977750288414410, guid: 0a3b6392f04558844bd340e68ced1ff9,
type: 2}
propertyPath: m_AnchoredPosition.y
value: -10
objectReference: {fileID: 0}
- target: {fileID: 224661754932301978, guid: 0a3b6392f04558844bd340e68ced1ff9,
type: 2}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 224661754932301978, guid: 0a3b6392f04558844bd340e68ced1ff9,
type: 2}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 224661754932301978, guid: 0a3b6392f04558844bd340e68ced1ff9,
type: 2}
propertyPath: m_AnchoredPosition.x
value: 182.75
objectReference: {fileID: 0}
- target: {fileID: 224661754932301978, guid: 0a3b6392f04558844bd340e68ced1ff9,
type: 2}
propertyPath: m_AnchoredPosition.y
value: -10
objectReference: {fileID: 0}
- target: {fileID: 224661754932301978, guid: 0a3b6392f04558844bd340e68ced1ff9,
type: 2}
propertyPath: m_SizeDelta.x
value: 100
objectReference: {fileID: 0}
- target: {fileID: 224321436090849264, guid: 0a3b6392f04558844bd340e68ced1ff9,
type: 2}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 224321436090849264, guid: 0a3b6392f04558844bd340e68ced1ff9,
type: 2}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 224321436090849264, guid: 0a3b6392f04558844bd340e68ced1ff9,
type: 2}
propertyPath: m_AnchoredPosition.x
value: 523.25
objectReference: {fileID: 0}
- target: {fileID: 224321436090849264, guid: 0a3b6392f04558844bd340e68ced1ff9,
type: 2}
propertyPath: m_AnchoredPosition.y
value: -10
objectReference: {fileID: 0}
- target: {fileID: 224321436090849264, guid: 0a3b6392f04558844bd340e68ced1ff9,
type: 2}
propertyPath: m_SizeDelta.x
value: 100
objectReference: {fileID: 0}
- target: {fileID: 224155073134331500, guid: 0a3b6392f04558844bd340e68ced1ff9,
type: 2}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 224155073134331500, guid: 0a3b6392f04558844bd340e68ced1ff9,
type: 2}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 224155073134331500, guid: 0a3b6392f04558844bd340e68ced1ff9,
type: 2}
propertyPath: m_AnchoredPosition.x
value: 863.75
objectReference: {fileID: 0}
- target: {fileID: 224155073134331500, guid: 0a3b6392f04558844bd340e68ced1ff9,
type: 2}
propertyPath: m_AnchoredPosition.y
value: -10
objectReference: {fileID: 0}
- target: {fileID: 224155073134331500, guid: 0a3b6392f04558844bd340e68ced1ff9,
type: 2}
propertyPath: m_SizeDelta.x
value: 100
objectReference: {fileID: 0}
- target: {fileID: 224146843657791948, guid: 0a3b6392f04558844bd340e68ced1ff9,
type: 2}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 224146843657791948, guid: 0a3b6392f04558844bd340e68ced1ff9,
type: 2}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 224146843657791948, guid: 0a3b6392f04558844bd340e68ced1ff9,
type: 2}
propertyPath: m_AnchoredPosition.x
value: 1204.25
objectReference: {fileID: 0}
- target: {fileID: 224146843657791948, guid: 0a3b6392f04558844bd340e68ced1ff9,
type: 2}
propertyPath: m_AnchoredPosition.y
value: -10
objectReference: {fileID: 0}
- target: {fileID: 224146843657791948, guid: 0a3b6392f04558844bd340e68ced1ff9,
type: 2}
propertyPath: m_SizeDelta.x
value: 100
objectReference: {fileID: 0}
- target: {fileID: 224487761690423894, guid: 0a3b6392f04558844bd340e68ced1ff9,
type: 2}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224235448540703324, guid: 0a3b6392f04558844bd340e68ced1ff9,
type: 2}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 224235448540703324, guid: 0a3b6392f04558844bd340e68ced1ff9,
type: 2}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 224235448540703324, guid: 0a3b6392f04558844bd340e68ced1ff9,
type: 2}
propertyPath: m_AnchoredPosition.x
value: 40.5
objectReference: {fileID: 0}
- target: {fileID: 224235448540703324, guid: 0a3b6392f04558844bd340e68ced1ff9,
type: 2}
propertyPath: m_AnchoredPosition.y
value: -10
objectReference: {fileID: 0}
- target: {fileID: 224235448540703324, guid: 0a3b6392f04558844bd340e68ced1ff9,
type: 2}
propertyPath: m_SizeDelta.x
value: 81
objectReference: {fileID: 0}
- target: {fileID: 224235448540703324, guid: 0a3b6392f04558844bd340e68ced1ff9,
type: 2}
propertyPath: m_SizeDelta.y
value: 20
objectReference: {fileID: 0}
- target: {fileID: 224025734146448884, guid: 0a3b6392f04558844bd340e68ced1ff9,
type: 2}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 224025734146448884, guid: 0a3b6392f04558844bd340e68ced1ff9,
type: 2}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 224025734146448884, guid: 0a3b6392f04558844bd340e68ced1ff9,
type: 2}
propertyPath: m_AnchoredPosition.x
value: 776.5
objectReference: {fileID: 0}
- target: {fileID: 224025734146448884, guid: 0a3b6392f04558844bd340e68ced1ff9,
type: 2}
propertyPath: m_AnchoredPosition.y
value: -10
objectReference: {fileID: 0}
- target: {fileID: 224025734146448884, guid: 0a3b6392f04558844bd340e68ced1ff9,
type: 2}
propertyPath: m_SizeDelta.x
value: 1387
objectReference: {fileID: 0}
- target: {fileID: 224025734146448884, guid: 0a3b6392f04558844bd340e68ced1ff9,
type: 2}
propertyPath: m_SizeDelta.y
value: 20
objectReference: {fileID: 0}
- target: {fileID: 224999085726949720, guid: 0a3b6392f04558844bd340e68ced1ff9,
type: 2}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 224999085726949720, guid: 0a3b6392f04558844bd340e68ced1ff9,
type: 2}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 224999085726949720, guid: 0a3b6392f04558844bd340e68ced1ff9,
type: 2}
propertyPath: m_AnchoredPosition.x
value: 1508.5
objectReference: {fileID: 0}
- target: {fileID: 224999085726949720, guid: 0a3b6392f04558844bd340e68ced1ff9,
type: 2}
propertyPath: m_AnchoredPosition.y
value: -10
objectReference: {fileID: 0}
- target: {fileID: 224999085726949720, guid: 0a3b6392f04558844bd340e68ced1ff9,
type: 2}
propertyPath: m_SizeDelta.x
value: 73
objectReference: {fileID: 0}
- target: {fileID: 224999085726949720, guid: 0a3b6392f04558844bd340e68ced1ff9,
type: 2}
propertyPath: m_SizeDelta.y
value: 20
objectReference: {fileID: 0}
m_RemovedComponents: []
m_ParentPrefab: {fileID: 100100000, guid: 0a3b6392f04558844bd340e68ced1ff9, type: 2}
m_IsPrefabParent: 0
Expand Down Expand Up @@ -1472,7 +1773,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: -100, y: 55.56}
m_SizeDelta: {x: -100, y: 87.88}
m_Pivot: {x: 0.5, y: 0}
--- !u!114 &2024855461
MonoBehaviour:
Expand Down
Loading