Dev Changes before Master Merge #1175
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…t it like we were.
Renamed editor input source specific classes
I may be totally missing something here, but I'm just going off what the build window generates for me (that is, it builds to the build folder directory, it doesn't build to incremental subfolders or anything like that) Currently, it will search the build folder for folders, then search those folders for an `AppPackages` folder and use that to identify it's a build. But this isn't how builds are generated by the build tools. The `AppPackages` folder is in the root of the build folder, so what should actually be iterated through is the contents of the `AppPackages` folder in the root of the build folder. _Those_ are the individual builds.
…ox) selection and renamed to InteractiveSet.
Changed to environment
Fixing little typo 'envionment'
Tracks previously untracked controllers if seen in InteractionSourceUpdated event.
Fixes build discovery
Extended InteractiveRadialSet to allow multiple selection
Only just found this one, you need Private Network Client Server enabled in order to use the Unity Remote Profiler with Hololens. Wording may need tweaking, or perhaps it would be best moved into a separate menu option for "Enable Remote Profiler" that pops up a window saying "This will enable the 'Private Network Client Server' capability, are you sure?" instead.
Adds SingleInstance from dev branch and fixed microsoft#1031
Cleans up event handlers and Tracks previously untracked controllers if seen in InteractionSourceUpdated event.
Added a note to capabilities RE: Remote Profiler
Handle a null switch and gracefully stop searching
Set Project Version to minimum required version.
|
@keveleigh Is this better? |
keveleigh
reviewed
Oct 16, 2017
| SupportsMenuButton: 0 | ||
| SupportsGrasp: 0 | ||
| RaiseEventsBasedOnVisibility: 1 | ||
| sourceKind: 1 | ||
| SourceKind: 0 |
There was a problem hiding this comment.
This should stay 1, for Hand. I believe 0 is Other.
| SupportsMenuButton: 0 | ||
| SupportsGrasp: 0 | ||
| RaiseEventsBasedOnVisibility: 1 | ||
| sourceKind: 1 | ||
| SourceKind: 0 |
There was a problem hiding this comment.
Same as above, this should stay 1.
| @@ -13,33 +13,23 @@ public class SetGlobalListener : MonoBehaviour | |||
| { | |||
| private void OnEnable() | |||
| { | |||
| StartCoroutine(AddGlobalListener()); | |||
| InputManager.Instance.AddGlobalListener(gameObject); | |||
There was a problem hiding this comment.
We should probably still have an Instance != null check here, just in case.
There was a problem hiding this comment.
We would probably want it to throw the null ref. If it's not found by then, it means the InputManager either isn't in the scene or it's disabled.
The Singleton updates should have fixed the issues we were having with Awake not being called in time.
keveleigh
approved these changes
Oct 16, 2017
jessemcculloch
approved these changes
Oct 17, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Builds for 5.6, 2017.1, and 2017.2
All Unit Tests pass for 5.6, 2017.1, and 2017.2