Release 13 branch to master #5007
Merged
Conversation
This file contains hidden or 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
* improved settings and move to default_settings * update models
- updated release tag validation script to automate the updating of files with release tags that need to be changed as part of the pre-commit operation.
… (#4968) Co-authored-by: Marwan Mattar <marwan@unity3d.com> Co-authored-by: Chris Elion <chris.elion@unity3d.com>
chriselion
reviewed
Feb 24, 2021
| @@ -43,6 +47,7 @@ internal class RpcCommunicator : ICommunicator | |||
| Dictionary<string, ActionSpec> m_UnsentBrainKeys = new Dictionary<string, ActionSpec>(); | |||
|
|
|||
|
|
|||
| #if MLA_SUPPORTED_TRAINING_PLATFORM | |||
There was a problem hiding this comment.
I think this was the merge problem I was worried about. I think you can either remove all the #if MLA_SUPPORTED_TRAINING_PLATFORM except the top-level one, or just keep master the master version.
There was a problem hiding this comment.
should be fixed now
chriselion
approved these changes
Feb 24, 2021
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Merge changes from release 13 to master