Merge pull request #765 from paseb/master

3D Keyboard
microsoft · Jul 18, 2017 · 9ede366 · 9ede366
2 parents a785bf8 + 077005a
commit 9ede366
Show file tree

Hide file tree

Showing 51 changed files with 30,579 additions and 2 deletions.
diff --git a/Assets/HoloToolkit-Tests/Input/Scenes/KeyboardTest.unity b/Assets/HoloToolkit-Tests/Input/Scenes/KeyboardTest.unity
diff --git a/Assets/HoloToolkit-Tests/Input/Scenes/KeyboardTest.unity.meta b/Assets/HoloToolkit-Tests/Input/Scenes/KeyboardTest.unity.meta
diff --git a/Assets/HoloToolkit/Input/Animations/Cursor/CursorSimple.controller b/Assets/HoloToolkit/Input/Animations/Cursor/CursorSimple.controller
@@ -259,7 +259,7 @@ AnimatorStateTransition:
   m_TransitionDuration: 0.25
   m_TransitionOffset: 0
   m_ExitTime: 0.75
-  m_HasExitTime: 1
+  m_HasExitTime: 0
   m_HasFixedDuration: 1
   m_InterruptionSource: 0
   m_OrderedInterruption: 1
@@ -283,7 +283,7 @@ AnimatorStateTransition:
   m_TransitionDuration: 0.14526263
   m_TransitionOffset: 0.0000004768374
   m_ExitTime: 0.31158686
-  m_HasExitTime: 1
+  m_HasExitTime: 0
   m_HasFixedDuration: 1
   m_InterruptionSource: 0
   m_OrderedInterruption: 1

diff --git a/Assets/HoloToolkit/UI/Images.meta b/Assets/HoloToolkit/UI/Images.meta
diff --git a/Assets/HoloToolkit/UI/Images/KeyboardKeyGlyphs_Backspace.png b/Assets/HoloToolkit/UI/Images/KeyboardKeyGlyphs_Backspace.png
diff --git a/Assets/HoloToolkit/UI/Images/KeyboardKeyGlyphs_Backspace.png.meta b/Assets/HoloToolkit/UI/Images/KeyboardKeyGlyphs_Backspace.png.meta
diff --git a/Assets/HoloToolkit/UI/Images/KeyboardKeyGlyphs_Close.png b/Assets/HoloToolkit/UI/Images/KeyboardKeyGlyphs_Close.png
diff --git a/Assets/HoloToolkit/UI/Images/KeyboardKeyGlyphs_Close.png.meta b/Assets/HoloToolkit/UI/Images/KeyboardKeyGlyphs_Close.png.meta
diff --git a/Assets/HoloToolkit/UI/Images/KeyboardKeyGlyphs_Dictation.png b/Assets/HoloToolkit/UI/Images/KeyboardKeyGlyphs_Dictation.png
diff --git a/Assets/HoloToolkit/UI/Images/KeyboardKeyGlyphs_Dictation.png.meta b/Assets/HoloToolkit/UI/Images/KeyboardKeyGlyphs_Dictation.png.meta
diff --git a/Assets/HoloToolkit/UI/Images/KeyboardKeyGlyphs_Down.png b/Assets/HoloToolkit/UI/Images/KeyboardKeyGlyphs_Down.png
diff --git a/Assets/HoloToolkit/UI/Images/KeyboardKeyGlyphs_Down.png.meta b/Assets/HoloToolkit/UI/Images/KeyboardKeyGlyphs_Down.png.meta
diff --git a/Assets/HoloToolkit/UI/Images/KeyboardKeyGlyphs_Left.png b/Assets/HoloToolkit/UI/Images/KeyboardKeyGlyphs_Left.png