Skip to content
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

Jump to bottom

3D Keyboard #765

Merged
merged 33 commits into from
Jul 18, 2017
Merged

3D Keyboard #765

Show file tree
Hide file tree
Changes from 23 commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
512cf7a
[+] Adding the first drop of the system keyboard for inclusion in HTK.
paseb Apr 5, 2017
641e6c9
[~] Remapped keys and added the input field for clicking and entry.
paseb Apr 6, 2017
35930bc
Merge https://github.com/Microsoft/HoloToolkit-Unity
paseb Apr 6, 2017
a15a94f
[+] Updated the keyboard script and input field.
paseb Apr 6, 2017
757b394
[~] Updated variable name to match m_ and updated the Classdiagram.cd…
paseb Apr 6, 2017
e52b83c
Merge https://github.com/Microsoft/HoloToolkit-Unity
paseb Apr 10, 2017
9b40619
[~] Updating to have the standard input module or it explodes.
paseb Apr 12, 2017
1e4d03a
Merge https://github.com/Microsoft/HoloToolkit-Unity
paseb Apr 27, 2017
b67544e
Merge branch 'master' of https://github.com/Microsoft/HoloToolkit-Unity
paseb Apr 30, 2017
7c8b389
[~] Update the scene to have the basic input module so that you don't…
paseb Apr 30, 2017
92272f1
Merge branch 'master' of https://github.com/paseb/HoloToolkit-Unity
paseb May 17, 2017
da56ca0
Refined Keyboard Prefab's symbol glyphs and test panel
May 19, 2017
47bc0eb
[^] Updated the code comments for the keyboard and updated the Unity …
paseb May 19, 2017
c0a75bb
Merge branch 'master' of https://github.com/paseb/HoloToolkit-Unity
paseb May 19, 2017
ef39dc3
Merge https://github.com/Microsoft/HoloToolkit-Unity
paseb May 19, 2017
62ffd7f
Merge https://github.com/Microsoft/HoloToolkit-Unity
paseb Jun 20, 2017
bfd509c
Merge https://github.com/Microsoft/HoloToolkit-Unity
paseb Jul 6, 2017
bb0e683
[^] Number of fixes with working axis slider, selection in slider and…
paseb Jul 8, 2017
a58b26d
[!] Fixed bug with button registration and with buttons remaining active
paseb Jul 8, 2017
4496651
[~] Added the toggle for keyboard to send submit on enter or insert a…
paseb Jul 10, 2017
b9216cf
Merge https://github.com/Microsoft/HoloToolkit-Unity
paseb Jul 10, 2017
3e1a6f4
[-] Removing the Class diagram and updating project setting back to o…
paseb Jul 10, 2017
612d3a5
[~] Reverting projectsettings to origin
paseb Jul 10, 2017
a6f2649
Reverted to master
paseb Jul 11, 2017
5f1150c
[!] Reverting the Graphics and project settings to origin
paseb Jul 11, 2017
d1d66c7
[~] Fresh copy of project settings and graphics settings from HTK master
paseb Jul 11, 2017
842cb4a
[~] Number of excellent code cleanup and consistency updates
paseb Jul 11, 2017
bd1dd39
[~] Additional updates to for loop and explicit access declaration
paseb Jul 11, 2017
9b34cf2
[~] Cleaned up tab formatting and explicit permissions
paseb Jul 11, 2017
41c8621
[~] Fixed tab formatting
paseb Jul 11, 2017
947611d
[~] Really fixed tab formatting this time
paseb Jul 11, 2017
5a9b523
[~] Addressing comments about code consistencies
paseb Jul 13, 2017
077005a
Merge branch 'master' of https://github.com/paseb/HoloToolkit-Unity
paseb Jul 13, 2017
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
1,363 changes: 1,363 additions & 0 deletions Assets/HoloToolkit-Tests/Input/Scenes/KeyboardTest.unity
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 8 additions & 0 deletions Assets/HoloToolkit-Tests/Input/Scenes/KeyboardTest.unity.meta
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions Assets/HoloToolkit/Input/Animations/Cursor/CursorSimple.controller
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
9 changes: 9 additions & 0 deletions Assets/HoloToolkit/UI/Images.meta
View file
Open in desktop

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

Binary file added Assets/HoloToolkit/UI/Images/KeyboardKeyGlyphs_Backspace.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
76 changes: 76 additions & 0 deletions Assets/HoloToolkit/UI/Images/KeyboardKeyGlyphs_Backspace.png.meta
View file
Open in desktop

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

Binary file added Assets/HoloToolkit/UI/Images/KeyboardKeyGlyphs_Close.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
76 changes: 76 additions & 0 deletions Assets/HoloToolkit/UI/Images/KeyboardKeyGlyphs_Close.png.meta
View file
Open in desktop

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

Binary file added Assets/HoloToolkit/UI/Images/KeyboardKeyGlyphs_Dictation.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
76 changes: 76 additions & 0 deletions Assets/HoloToolkit/UI/Images/KeyboardKeyGlyphs_Dictation.png.meta
View file
Open in desktop

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

Binary file added Assets/HoloToolkit/UI/Images/KeyboardKeyGlyphs_Down.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
76 changes: 76 additions & 0 deletions Assets/HoloToolkit/UI/Images/KeyboardKeyGlyphs_Down.png.meta
View file
Open in desktop

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

Binary file added Assets/HoloToolkit/UI/Images/KeyboardKeyGlyphs_Left.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading