8000 Release 13 branch to master by surfnerd · Pull Request #5007 · Unity-Technologies/ml-agents · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Release 13 branch to master #5007

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
Merged
merged 21 commits into from
Feb 24, 2021
Merged

Release 13 branch to master #5007

merged 21 commits into from
Feb 24, 2021

Conversation

surfnerd
Copy link
Contributor

Merge changes from release 13 to master

Chris Elion and others added 20 commits February 16, 2021 22:56
[MLA-1768] retrain Match3 scene (#4943)
a06b1da 
* improved settings and move to default_settings

* update models
@surfnerd
Release 13 versions. (#4946)
fd1d242 
- 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.
@surfnerd
Update readme for release_13. (#4951)
0c92a7c
@surfnerd
Update docs to pass doc validation. (#4953)
afdf754
update defines, compile out Initialize body on non-desktop (#4957)
68fa146
@philippds
Masking Discrete Actions typos (#4961) (#4964)
3befced 
Co-authored-by: Philipp Siedler <p.d.siedler@gmail.com>
@surfnerd
Adding references to the Extensions package to help promote it. (#4967)…
a1dee87 
… (#4968)

Co-authored-by: Marwan Mattar <marwan@unity3d.com>
Co-authored-by: Chris Elion <chris.elion@unity3d.com>
@surfnerd
Fix release link validations. (#4970)
07178a7 10000
@surfnerd
InputActuatorComponent to allow the generation of an action space fro…
52a6f80 
…m an InputActionAsset (#4881) (#4974)
handle no plugins found (#4969) (#4973)
013df33
@surfnerd
Tick extension version. (#4975)
e09732b
@surfnerd
Update 2018 project version to fix burst errors. (#4977) (#4978)
13af032
@surfnerd
Add an example project for the InputSystemActuator. (#4976) (#4980)
c16f6de
@surfnerd
Update barracuda, swtich Agents in Sorter use Burst. (#4979) (#4981)
60705e2
@surfnerd
Fix asmdef? (#4994) (#4996)
091940b
Make TrainingAnalyticsSideChannel internal (#4999)
ad620ec
[MLA-1783] built-in actuator type (#4950)
60d5d93
@surfnerd
Add component menues for some sensors and actuators. (#5001) (#5002)
dd4fd79
@surfnerd
Merge master -> release_13_branch-to-master
ce48a6e
@surfnerd
Merge branch 'master' into release_13_branch-to-master
06d2f75
@surfnerd surfnerd self-assigned this Feb 24, 2021
chriselion
chriselion reviewed Feb 24, 2021
View reviewed changes
com.unity.ml-agents/Runtime/Communicator/RpcCommunicator.cs Outdated
8000
@@ -43,6 +47,7 @@ internal class RpcCommunicator : ICommunicator
Dictionary<string, ActionSpec> m_UnsentBrainKeys = new Dictionary<string, ActionSpec>();


#if MLA_SUPPORTED_TRAINING_PLATFORM
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should be fixed now

chriselion
chriselion approved these changes Feb 24, 2021
View reviewed changes
Copy link
Contributor
@chriselion chriselion left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good (modulo the RpCommunicator merge)

@surfnerd surfnerd merged commit 2e50682 into master Feb 24, 2021
@surfnerd surfnerd deleted the release_13_branch-to-master branch February 25, 2021 20:05
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Feb 26, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@chriselion chriselion chriselion approved these changes

@dongruoping dongruoping Awaiting requested review from dongruoping

Assignees

@surfnerd surfnerd

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@surfnerd @chriselion
0