Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
6e69513
merging interactiveAssets
killerantz Oct 8, 2018
45dd334
merged interactionButtonLayout
killerantz Oct 8, 2018
4324577
merge interactionStates
killerantz Oct 8, 2018
dc21478
merge interactionThemes
killerantz Oct 8, 2018
131cb38
Merge interaction
killerantz Oct 8, 2018
85afe51
clean up files and renamed text materials so that the match the shade…
killerantz Oct 8, 2018
e66ab38
Addressed feedback from Simon on naming of some files and demo scene.
killerantz Oct 23, 2018
513ecb4
Organized custom inspector features to match MRTK patterns.
killerantz Oct 23, 2018
3329687
Fixed an issue that was caused by the Theme script renaming.
killerantz Oct 26, 2018
aba9a41
Merge pull request #2980 from Microsoft/feature/mrtk_interactable_dem…
Oct 26, 2018
d468fdd
Merge branch 'mrtk_development' of https://github.com/Microsoft/Mixed…
Oct 29, 2018
bc0c747
Merged mrtk_development. Added Toggle HolographicButton example.
Oct 29, 2018
3a0a386
Polished example sceens with MRTK Standard example assets - coffee cu…
Oct 29, 2018
6288e4d
Merge pull request #3013 from cre8ivepark/feature/mrtk_interactable_m…
StephenHodgson Oct 29, 2018
edaa6eb
moved layout3D code and InspectorFields out of Interactables and crea…
killerantz Nov 2, 2018
4074e2b
Added receiver components for developers to handle events.
killerantz Nov 2, 2018
2f47a05
Fixed some assembly code for finding derived classes.
killerantz Nov 2, 2018
c5fa8d5
merged with latest
killerantz Nov 3, 2018
649d161
Updated prefabs to fix errors from merge.
killerantz Nov 3, 2018
8fb953c
Fixed AutoCyclet spelling to AutoCycle and fixed prefabs and scene to…
killerantz Nov 7, 2018
e2fe228
Merge pull request #3068 from killerantz/feature/mrtk_interactable_la…
killerantz Nov 7, 2018
0bb18f8
Fixed issues with double click events, especially when isGlobal is se…
killerantz Nov 11, 2018
742897c
Removed Layout3D code and demos from branch, moved some of the base c…
killerantz Nov 12, 2018
8131909
Adding README file template.
Nov 13, 2018
18a0c60
Updated name spaces to include Interactables and inclosed directories…
killerantz Nov 13, 2018
ccc5583
Merge branch 'feature/mrtk_interactable_isGlobalFixes' of https://git…
killerantz Nov 13, 2018
8ad840e
Merge pull request #3117 from killerantz/feature/mrtk_interactable_is…
killerantz Nov 16, 2018
fce80c7
Merge remote-tracking branch 'origin/mrtk_development' into feature/m…
Dec 13, 2018
6fb50e0
automatic changes done by unity after merge
Dec 13, 2018
04b69cc
resave scene with unity 2018.2.19f1 (unchanged)
Dec 13, 2018
fe5bdf6
fix typo
Dec 13, 2018
64415ac
Update InteractablesGallery to changes merged in from mrtk_development
Dec 13, 2018
3b71e2e
fix typo causing warning "MixedRealiityPlayspace"
Dec 13, 2018
4b97339
Merge pull request #3270 from NorbertNemec/mrtk_interactable-merged-a…
StephenHodgson Dec 13, 2018
08dcff0
Updated radial and checkBox themes to remove the dot and check mark o…
killerantz Dec 17, 2018
1dc86c3
Fixed an issue with the activatorTheme. It should not have easing con…
killerantz Dec 17, 2018
1042d96
Fixed spelling errors and removed unused commented code.
killerantz Dec 18, 2018
3174155
removed a space and return
killerantz Dec 18, 2018
91698ca
cleaned up returns
killerantz Dec 19, 2018
6e09c7b
Merge pull request #3279 from killerantz/fix/radialAndCheckboxFix
keveleigh Dec 19, 2018
81a5980
Merge branch 'mrtk_development' of https://github.com/Microsoft/Mixed…
cre8ivepark Jan 9, 2019
6a83e55
Merge pull request #3321 from cre8ivepark/feature/mrtk_interactable_m…
Jan 9, 2019
5e12a4f
Merge branch 'mrtk_development' into feature/mrtk_interactable
keveleigh Jan 24, 2019
4b90689
Merge pull request #3363 from keveleigh/feature/mrtk_interactable
Jan 24, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"name": "MixedRealityToolkit-Examples.Demos.UX.Interactables",
"references": [
"Microsoft.MixedReality.Toolkit.SDK",
"Microsoft.MixedReality.Toolkit",
"Microsoft.MixedReality.Toolkit.SDK.Inspectors"
],
"optionalUnityReferences": [],
"includePlatforms": [],
"excludePlatforms": [],
"allowUnsafeCode": false
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,164 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &100100000
Prefab:
m_ObjectHideFlags: 1
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications: []
m_RemovedComponents: []
m_ParentPrefab: {fileID: 0}
m_RootGameObject: {fileID: 1976327359951936}
m_IsPrefabParent: 1
--- !u!1 &1513309078028022
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 5
m_Component:
- component: {fileID: 4463254989225456}
- component: {fileID: 33406258692433058}
- component: {fileID: 23197364594414254}
m_Layer: 0
m_Name: Cheese
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1976327359951936
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 5
m_Component:
- component: {fileID: 4538655477204070}
- component: {fileID: 65785153276639906}
- component: {fileID: 114528208345280030}
m_Layer: 0
m_Name: Cheese
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4463254989225456
Transform:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1513309078028022}
m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4538655477204070}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4538655477204070
Transform:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1976327359951936}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.047473792, y: 0.047473792, z: 0.047473792}
m_Children:
- {fileID: 4463254989225456}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!23 &23197364594414254
MeshRenderer:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1513309078028022}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RenderingLayerMask: 4294967295
m_Materials:
- {fileID: 2100000, guid: 71d471797c0e430783230146721c3fcb, type: 2}
- {fileID: 2100000, guid: 71d471797c0e430783230146721c3fcb, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 0
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
--- !u!33 &33406258692433058
MeshFilter:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1513309078028022}
m_Mesh: {fileID: 4300000, guid: 3f8a3164171bcba42b1e2b051b994a3c, type: 3}
--- !u!65 &65785153276639906
BoxCollider:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1976327359951936}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 4.1451945, y: 2.7606258, z: 3.7189484}
m_Center: {x: 3.3503172, y: 1.2563689, z: -1.3594743}
--- !u!114 &114528208345280030
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1976327359951936}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1410eac1ae94b4d4492a09cc368e152c, type: 3}
m_Name:
m_EditorClassIdentifier:
Enabled: 1
States: {fileID: 11400000, guid: 5eac1712038236e4b8ffdb3893804fe1, type: 2}
InputAction:
id: 0
description:
axisConstraint: 0
InputActionId: 0
IsGlobal: 0
Dimensions: 1
CanSelect: 1
CanDeselect: 1
VoiceCommand:
RequiresGaze: 1
Profiles:
- Target: {fileID: 1513309078028022}
Themes:
- {fileID: 11400000, guid: 1872be27ce323c54f93896976d90d5c4, type: 2}
HadDefaultTheme: 1
OnClick:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0,
Culture=neutral, PublicKeyToken=null
Events: []

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading