Final merge of dev branch into master, including alternate model loading #1268
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
… AlwaysUseAlternateModel boolean to allow you to specify a default if the models aren't found/loaded or specify a model that should always be used.
Fixing build break for UWP builds.
Allowing default versus overriden controller models
|
yeah we should have caught that he submitted to the dev branch. Awe well. |
|
I caught it but figured it'd be easier to do it myself, since there had been some big changes to this script in master. |
|
Yeah I was tempted to delete that branch too, but wanted to check first if it was okay. |
|
After this, we should delete it. |
|
Sorry about that. Everything looks good to me. |
|
@MsDerekMa All good! |
StephenHodgson
approved these changes
Oct 31, 2017
fieldsJacksonG
approved these changes
Nov 1, 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.
The Dev_Unity_2017.2.0 branch will be retired after this PR to prevent future work from being done in it.