Skip to content
This repository has been archived by the owner on Aug 11, 2024. It is now read-only.

Commit

Permalink
Merge branch 'master' into development
Browse files Browse the repository at this point in the history
  • Loading branch information
StephenHodgson committed Jul 19, 2019
2 parents 99a8504 + ddd2af9 commit 7649727
Show file tree
Hide file tree
Showing 73 changed files with 19,670 additions and 195 deletions.
25 changes: 13 additions & 12 deletions docs/api/XRTK.Definitions.InputSystem.MixedRealityInputAction.html
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ <h3 id="properties">Properties
<a href="https://github.com/XRTK/XRTK-Core/new/development/docs-ref-overwrite/new?filename=XRTK_Definitions_InputSystem_MixedRealityInputAction_AxisConstraint.md&amp;value=---%0Auid%3A%20XRTK.Definitions.InputSystem.MixedRealityInputAction.AxisConstraint%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
</span>
<span class="small pull-right mobile-hide">
<a href="https://github.com/XRTK/XRTK-Core/blob/master/XRTK-Core/Packages/com.xrtk.core/Definitions/InputSystem/MixedRealityInputAction.cs/#L51">View Source</a>
<a href="https://github.com/XRTK/XRTK-Core/blob/master/XRTK-Core/Packages/com.xrtk.core/Definitions/InputSystem/MixedRealityInputAction.cs/#L54">View Source</a>
</span>
<a id="XRTK_Definitions_InputSystem_MixedRealityInputAction_AxisConstraint_" data-uid="XRTK.Definitions.InputSystem.MixedRealityInputAction.AxisConstraint*"></a>
<h4 id="XRTK_Definitions_InputSystem_MixedRealityInputAction_AxisConstraint" data-uid="XRTK.Definitions.InputSystem.MixedRealityInputAction.AxisConstraint">AxisConstraint</h4>
Expand Down Expand Up @@ -185,7 +185,7 @@ <h5 class="propertyValue">Property Value</h5>
<a href="https://github.com/XRTK/XRTK-Core/new/development/docs-ref-overwrite/new?filename=XRTK_Definitions_InputSystem_MixedRealityInputAction_Description.md&amp;value=---%0Auid%3A%20XRTK.Definitions.InputSystem.MixedRealityInputAction.Description%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
</span>
<span class="small pull-right mobile-hide">
<a href="https://github.com/XRTK/XRTK-Core/blob/master/XRTK-Core/Packages/com.xrtk.core/Definitions/InputSystem/MixedRealityInputAction.cs/#L43">View Source</a>
<a href="https://github.com/XRTK/XRTK-Core/blob/master/XRTK-Core/Packages/com.xrtk.core/Definitions/InputSystem/MixedRealityInputAction.cs/#L46">View Source</a>
</span>
<a id="XRTK_Definitions_InputSystem_MixedRealityInputAction_Description_" data-uid="XRTK.Definitions.InputSystem.MixedRealityInputAction.Description*"></a>
<h4 id="XRTK_Definitions_InputSystem_MixedRealityInputAction_Description" data-uid="XRTK.Definitions.InputSystem.MixedRealityInputAction.Description">Description</h4>
Expand Down Expand Up @@ -216,7 +216,7 @@ <h5 class="propertyValue">Property Value</h5>
<a href="https://github.com/XRTK/XRTK-Core/new/development/docs-ref-overwrite/new?filename=XRTK_Definitions_InputSystem_MixedRealityInputAction_Id.md&amp;value=---%0Auid%3A%20XRTK.Definitions.InputSystem.MixedRealityInputAction.Id%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
</span>
<span class="small pull-right mobile-hide">
<a href="https://github.com/XRTK/XRTK-Core/blob/master/XRTK-Core/Packages/com.xrtk.core/Definitions/InputSystem/MixedRealityInputAction.cs/#L35">View Source</a>
<a href="https://github.com/XRTK/XRTK-Core/blob/master/XRTK-Core/Packages/com.xrtk.core/Definitions/InputSystem/MixedRealityInputAction.cs/#L38">View Source</a>
</span>
<a id="XRTK_Definitions_InputSystem_MixedRealityInputAction_Id_" data-uid="XRTK.Definitions.InputSystem.MixedRealityInputAction.Id*"></a>
<h4 id="XRTK_Definitions_InputSystem_MixedRealityInputAction_Id" data-uid="XRTK.Definitions.InputSystem.MixedRealityInputAction.Id">Id</h4>
Expand Down Expand Up @@ -247,11 +247,12 @@ <h5 class="propertyValue">Property Value</h5>
<a href="https://github.com/XRTK/XRTK-Core/new/development/docs-ref-overwrite/new?filename=XRTK_Definitions_InputSystem_MixedRealityInputAction_None.md&amp;value=---%0Auid%3A%20XRTK.Definitions.InputSystem.MixedRealityInputAction.None%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
</span>
<span class="small pull-right mobile-hide">
<a href="https://github.com/XRTK/XRTK-Core/blob/master/XRTK-Core/Packages/com.xrtk.core/Definitions/InputSystem/MixedRealityInputAction.cs/#L30">View Source</a>
<a href="https://github.com/XRTK/XRTK-Core/blob/master/XRTK-Core/Packages/com.xrtk.core/Definitions/InputSystem/MixedRealityInputAction.cs/#L33">View Source</a>
</span>
<a id="XRTK_Definitions_InputSystem_MixedRealityInputAction_None_" data-uid="XRTK.Definitions.InputSystem.MixedRealityInputAction.None*"></a>
<h4 id="XRTK_Definitions_InputSystem_MixedRealityInputAction_None" data-uid="XRTK.Definitions.InputSystem.MixedRealityInputAction.None">None</h4>
<div class="markdown level1 summary"></div>
<div class="markdown level1 summary"><p>Default input action that doesn't represent any defined action.</p>
</div>
<div class="markdown level1 conceptual"></div>
<h5 class="decalaration">Declaration</h5>
<div class="codewrapper">
Expand Down Expand Up @@ -279,7 +280,7 @@ <h3 id="methods">Methods
<a href="https://github.com/XRTK/XRTK-Core/new/development/docs-ref-overwrite/new?filename=XRTK_Definitions_InputSystem_MixedRealityInputAction_Equals_System_Object_.md&amp;value=---%0Auid%3A%20XRTK.Definitions.InputSystem.MixedRealityInputAction.Equals(System.Object)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
</span>
<span class="small pull-right mobile-hide">
<a href="https://github.com/XRTK/XRTK-Core/blob/master/XRTK-Core/Packages/com.xrtk.core/Definitions/InputSystem/MixedRealityInputAction.cs/#L81">View Source</a>
<a href="https://github.com/XRTK/XRTK-Core/blob/master/XRTK-Core/Packages/com.xrtk.core/Definitions/InputSystem/MixedRealityInputAction.cs/#L84">View Source</a>
</span>
<a id="XRTK_Definitions_InputSystem_MixedRealityInputAction_Equals_" data-uid="XRTK.Definitions.InputSystem.MixedRealityInputAction.Equals*"></a>
<h4 id="XRTK_Definitions_InputSystem_MixedRealityInputAction_Equals_System_Object_" data-uid="XRTK.Definitions.InputSystem.MixedRealityInputAction.Equals(System.Object)">Equals(Object)</h4>
Expand Down Expand Up @@ -328,7 +329,7 @@ <h5 class="overrides">Overrides</h5>
<a href="https://github.com/XRTK/XRTK-Core/new/development/docs-ref-overwrite/new?filename=XRTK_Definitions_InputSystem_MixedRealityInputAction_Equals_XRTK_Definitions_InputSystem_MixedRealityInputAction_.md&amp;value=---%0Auid%3A%20XRTK.Definitions.InputSystem.MixedRealityInputAction.Equals(XRTK.Definitions.InputSystem.MixedRealityInputAction)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
</span>
<span class="small pull-right mobile-hide">
<a href="https://github.com/XRTK/XRTK-Core/blob/master/XRTK-Core/Packages/com.xrtk.core/Definitions/InputSystem/MixedRealityInputAction.cs/#L75">View Source</a>
<a href="https://github.com/XRTK/XRTK-Core/blob/master/XRTK-Core/Packages/com.xrtk.core/Definitions/InputSystem/MixedRealityInputAction.cs/#L78">View Source</a>
</span>
<a id="XRTK_Definitions_InputSystem_MixedRealityInputAction_Equals_" data-uid="XRTK.Definitions.InputSystem.MixedRealityInputAction.Equals*"></a>
<h4 id="XRTK_Definitions_InputSystem_MixedRealityInputAction_Equals_XRTK_Definitions_InputSystem_MixedRealityInputAction_" data-uid="XRTK.Definitions.InputSystem.MixedRealityInputAction.Equals(XRTK.Definitions.InputSystem.MixedRealityInputAction)">Equals(MixedRealityInputAction)</h4>
Expand Down Expand Up @@ -375,7 +376,7 @@ <h5 class="returns">Returns</h5>
<a href="https://github.com/XRTK/XRTK-Core/new/development/docs-ref-overwrite/new?filename=XRTK_Definitions_InputSystem_MixedRealityInputAction_GetHashCode.md&amp;value=---%0Auid%3A%20XRTK.Definitions.InputSystem.MixedRealityInputAction.GetHashCode%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
</span>
<span class="small pull-right mobile-hide">
<a href="https://github.com/XRTK/XRTK-Core/blob/master/XRTK-Core/Packages/com.xrtk.core/Definitions/InputSystem/MixedRealityInputAction.cs/#L92">View Source</a>
<a href="https://github.com/XRTK/XRTK-Core/blob/master/XRTK-Core/Packages/com.xrtk.core/Definitions/InputSystem/MixedRealityInputAction.cs/#L95">View Source</a>
</span>
<a id="XRTK_Definitions_InputSystem_MixedRealityInputAction_GetHashCode_" data-uid="XRTK.Definitions.InputSystem.MixedRealityInputAction.GetHashCode*"></a>
<h4 id="XRTK_Definitions_InputSystem_MixedRealityInputAction_GetHashCode" data-uid="XRTK.Definitions.InputSystem.MixedRealityInputAction.GetHashCode">GetHashCode()</h4>
Expand Down Expand Up @@ -409,7 +410,7 @@ <h3 id="operators">Operators
<a href="https://github.com/XRTK/XRTK-Core/new/development/docs-ref-overwrite/new?filename=XRTK_Definitions_InputSystem_MixedRealityInputAction_op_Equality_XRTK_Definitions_InputSystem_MixedRealityInputAction_XRTK_Definitions_InputSystem_MixedRealityInputAction_.md&amp;value=---%0Auid%3A%20XRTK.Definitions.InputSystem.MixedRealityInputAction.op_Equality(XRTK.Definitions.InputSystem.MixedRealityInputAction%2CXRTK.Definitions.InputSystem.MixedRealityInputAction)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
</span>
<span class="small pull-right mobile-hide">
<a href="https://github.com/XRTK/XRTK-Core/blob/master/XRTK-Core/Packages/com.xrtk.core/Definitions/InputSystem/MixedRealityInputAction.cs/#L56">View Source</a>
<a href="https://github.com/XRTK/XRTK-Core/blob/master/XRTK-Core/Packages/com.xrtk.core/Definitions/InputSystem/MixedRealityInputAction.cs/#L59">View Source</a>
</span>
<a id="XRTK_Definitions_InputSystem_MixedRealityInputAction_op_Equality_" data-uid="XRTK.Definitions.InputSystem.MixedRealityInputAction.op_Equality*"></a>
<h4 id="XRTK_Definitions_InputSystem_MixedRealityInputAction_op_Equality_XRTK_Definitions_InputSystem_MixedRealityInputAction_XRTK_Definitions_InputSystem_MixedRealityInputAction_" data-uid="XRTK.Definitions.InputSystem.MixedRealityInputAction.op_Equality(XRTK.Definitions.InputSystem.MixedRealityInputAction,XRTK.Definitions.InputSystem.MixedRealityInputAction)">Equality(MixedRealityInputAction, MixedRealityInputAction)</h4>
Expand Down Expand Up @@ -461,7 +462,7 @@ <h5 class="returns">Returns</h5>
<a href="https://github.com/XRTK/XRTK-Core/new/development/docs-ref-overwrite/new?filename=XRTK_Definitions_InputSystem_MixedRealityInputAction_op_Inequality_XRTK_Definitions_InputSystem_MixedRealityInputAction_XRTK_Definitions_InputSystem_MixedRealityInputAction_.md&amp;value=---%0Auid%3A%20XRTK.Definitions.InputSystem.MixedRealityInputAction.op_Inequality(XRTK.Definitions.InputSystem.MixedRealityInputAction%2CXRTK.Definitions.InputSystem.MixedRealityInputAction)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
</span>
<span class="small pull-right mobile-hide">
<a href="https://github.com/XRTK/XRTK-Core/blob/master/XRTK-Core/Packages/com.xrtk.core/Definitions/InputSystem/MixedRealityInputAction.cs/#L61">View Source</a>
<a href="https://github.com/XRTK/XRTK-Core/blob/master/XRTK-Core/Packages/com.xrtk.core/Definitions/InputSystem/MixedRealityInputAction.cs/#L64">View Source</a>
</span>
<a id="XRTK_Definitions_InputSystem_MixedRealityInputAction_op_Inequality_" data-uid="XRTK.Definitions.InputSystem.MixedRealityInputAction.op_Inequality*"></a>
<h4 id="XRTK_Definitions_InputSystem_MixedRealityInputAction_op_Inequality_XRTK_Definitions_InputSystem_MixedRealityInputAction_XRTK_Definitions_InputSystem_MixedRealityInputAction_" data-uid="XRTK.Definitions.InputSystem.MixedRealityInputAction.op_Inequality(XRTK.Definitions.InputSystem.MixedRealityInputAction,XRTK.Definitions.InputSystem.MixedRealityInputAction)">Inequality(MixedRealityInputAction, MixedRealityInputAction)</h4>
Expand Down Expand Up @@ -515,7 +516,7 @@ <h3 id="eii">Explicit Interface Implementations
<a href="https://github.com/XRTK/XRTK-Core/new/development/docs-ref-overwrite/new?filename=XRTK_Definitions_InputSystem_MixedRealityInputAction_System_Collections_IEqualityComparer_Equals_System_Object_System_Object_.md&amp;value=---%0Auid%3A%20XRTK.Definitions.InputSystem.MixedRealityInputAction.System%23Collections%23IEqualityComparer%23Equals(System.Object%2CSystem.Object)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
</span>
<span class="small pull-right mobile-hide">
<a href="https://github.com/XRTK/XRTK-Core/blob/master/XRTK-Core/Packages/com.xrtk.core/Definitions/InputSystem/MixedRealityInputAction.cs/#L68">View Source</a>
<a href="https://github.com/XRTK/XRTK-Core/blob/master/XRTK-Core/Packages/com.xrtk.core/Definitions/InputSystem/MixedRealityInputAction.cs/#L71">View Source</a>
</span>
<a id="XRTK_Definitions_InputSystem_MixedRealityInputAction_System_Collections_IEqualityComparer_Equals_" data-uid="XRTK.Definitions.InputSystem.MixedRealityInputAction.System#Collections#IEqualityComparer#Equals*"></a>
<h4 id="XRTK_Definitions_InputSystem_MixedRealityInputAction_System_Collections_IEqualityComparer_Equals_System_Object_System_Object_" data-uid="XRTK.Definitions.InputSystem.MixedRealityInputAction.System#Collections#IEqualityComparer#Equals(System.Object,System.Object)">IEqualityComparer.Equals(Object, Object)</h4>
Expand Down Expand Up @@ -567,7 +568,7 @@ <h5 class="returns">Returns</h5>
<a href="https://github.com/XRTK/XRTK-Core/new/development/docs-ref-overwrite/new?filename=XRTK_Definitions_InputSystem_MixedRealityInputAction_System_Collections_IEqualityComparer_GetHashCode_System_Object_.md&amp;value=---%0Auid%3A%20XRTK.Definitions.InputSystem.MixedRealityInputAction.System%23Collections%23IEqualityComparer%23GetHashCode(System.Object)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
</span>
<span class="small pull-right mobile-hide">
<a href="https://github.com/XRTK/XRTK-Core/blob/master/XRTK-Core/Packages/com.xrtk.core/Definitions/InputSystem/MixedRealityInputAction.cs/#L87">View Source</a>
<a href="https://github.com/XRTK/XRTK-Core/blob/master/XRTK-Core/Packages/com.xrtk.core/Definitions/InputSystem/MixedRealityInputAction.cs/#L90">View Source</a>
</span>
<a id="XRTK_Definitions_InputSystem_MixedRealityInputAction_System_Collections_IEqualityComparer_GetHashCode_" data-uid="XRTK.Definitions.InputSystem.MixedRealityInputAction.System#Collections#IEqualityComparer#GetHashCode*"></a>
<h4 id="XRTK_Definitions_InputSystem_MixedRealityInputAction_System_Collections_IEqualityComparer_GetHashCode_System_Object_" data-uid="XRTK.Definitions.InputSystem.MixedRealityInputAction.System#Collections#IEqualityComparer#GetHashCode(System.Object)">IEqualityComparer.GetHashCode(Object)</h4>
Expand Down
Loading

0 comments on commit 7649727

Please sign in to comment.