Merge pull request #2157 from Unity-Technologies/release-v0.8.2

Release v0.8.2

.circleci/config.yml

@@ -1,4 +1,4 @@
-version: 2.1
+version: 2.0
 
 jobs:
   build:
@@ -20,16 +20,18 @@ jobs:
           command: |
             python3 -m venv venv
             . venv/bin/activate
+            pip install --upgrade pip
+            pip install --upgrade setuptools
             cd ml-agents-envs && pip install -e .
             cd ../ml-agents && pip install -e .
-            pip install pytest-cov==2.6.1 codacy-coverage==1.3.11
+            pip install black pytest-cov==2.6.1 codacy-coverage==1.3.11
             cd ../gym-unity && pip install -e .
 
       - save_cache:
           paths:
             - ./venv
           key: v1-dependencies-{{ checksum "ml-agents/setup.py" }}
-        
+
       - run:
           name: Run Tests for ml-agents and gym_unity
           command: |
@@ -38,6 +40,21 @@ jobs:
             pytest --cov=mlagents --cov-report xml --junitxml=test-reports/junit.xml -p no:warnings
             python-codacy-coverage -r coverage.xml
 
+      - run:
+          name: Check Code Style for ml-agents and gym_unity using black
+          command: |
+            . venv/bin/activate
+            black --check ml-agents
+            black --check ml-agents-envs
+            black --check gym-unity
+
+      - run:
+          name: Verify there are no hidden/missing metafiles.
+          # Renaming files or deleting files can leave metafiles behind that makes Unity very unhappy.
+          command: |
+            . venv/bin/activate
+            python utils/validate_meta_files.py
+
       - store_test_results:
           path: test-reports
 

.gitignore

@@ -7,7 +7,6 @@
 /UnitySDK/[Uu]nity[Pp]ackage[Mm]anager/
 /UnitySDK/Assets/AssetStoreTools*
 /UnitySDK/Assets/Plugins*
-/UnitySDK/Assets/Gizmos*
 /UnitySDK/Assets/Demonstrations*
 
 # Tensorflow Model Info
@@ -72,6 +71,7 @@
 *.pyc
 *.idea/misc.xml
 *.idea/modules.xml
+*.idea/
 *.iml
 *.cache
 */build/
@@ -97,3 +97,6 @@ ml-agents-protobuf/Grpc*
 # Ignore PyPi build files.
 dist/
 build/
+
+# Python virtual environment
+venv/

CONTRIBUTING.md

@@ -50,7 +50,4 @@ PR explaining the nature of the environment and task.
 
 ## Style Guide
 
-When performing changes to the codebase, ensure that you follow the style guide
-of the file you're modifying. For Python, we follow
-[PEP 8](https://www.python.org/dev/peps/pep-0008/).
-For C#, we will soon be adding a formal style guide for our repository.
+When performing changes to the codebase, please ensure that all python code is reformatted using the [black](https://github.com/ambv/black) formatter. For C#, we will soon be requirements for style and formatting.

UnitySDK/Assets/ML-Agents/Editor/Builder.cs

@@ -0,0 +1,14 @@
+#if UNITY_CLOUD_BUILD
+
+namespace MLAgents
+{
+    public static class Builder
+    {
+        public static void PreExport()
+        {
+            BuilderUtils.SwitchAllLearningBrainToControlMode();
+        }
+    }
+}
+
+#endif

UnitySDK/Assets/ML-Agents/Editor/BuilderUtils.cs

@@ -0,0 +1,44 @@
+#if UNITY_CLOUD_BUILD
+
+using System.Linq;
+using UnityEditor;
+using UnityEditor.SceneManagement;
+using UnityEngine;
+using System.IO;
+
+namespace MLAgents
+{
+    public static class BuilderUtils
+    {
+        public static void SwitchAllLearningBrainToControlMode()
+        {
+            Debug.Log("The Switching to control mode function is triggered");
+            string[] scenePaths = Directory.GetFiles("Assets/ML-Agents/Examples/", "*.unity", SearchOption.AllDirectories);
+            foreach (string scenePath in scenePaths)
+            {
+                var curScene = EditorSceneManager.OpenScene(scenePath);
+                var aca = SceneAsset.FindObjectOfType<Academy>();
+                if (aca != null)
+                {
+                    var learningBrains = aca.broadcastHub.broadcastingBrains.Where(
+                        x => x != null && x is LearningBrain);
+                    foreach (Brain brain in learningBrains)
+                    {
+                        if (!aca.broadcastHub.IsControlled(brain))
+                        {
+                            Debug.Log("Switched brain in scene " + scenePath);
+                            aca.broadcastHub.SetControlled(brain, true);
+                        }
+                    }
+                    EditorSceneManager.SaveScene(curScene);
+                }
+                else
+                {
+                    Debug.Log("scene " + scenePath + " doesn't have a Academy in it");
+                }
+            }
+        }
+    }
+}
+
+#endif

UnitySDK/Assets/ML-Agents/Editor/HeuristicBrainEditor.cs

@@ -47,7 +47,7 @@ private static void CheckIsDecision(HeuristicBrain brain)
                 {
                     Debug.LogError(
                         "Instance of " + brain.decisionScript.name + " couldn't be created. " +
-                        "The the script class needs to derive from Decision.");
+                        "The script class needs to derive from Decision.");
                     brain.decisionScript = null;
                 }
             }

UnitySDK/Assets/ML-Agents/Editor/Tests/DemonstrationTests.cs

@@ -14,9 +14,9 @@ public class DemonstrationTests : MonoBehaviour
         [Test]
         public void TestSanitization()
         {
-            const string dirtyString = "abc123&!@";
+            const string dirtyString = "abc1234567&!@";
             const string knownCleanString = "abc123";
-            var cleanString = DemonstrationRecorder.SanitizeName(dirtyString);
+            var cleanString = DemonstrationRecorder.SanitizeName(dirtyString, 6);
             Assert.AreNotEqual(dirtyString, cleanString);
             Assert.AreEqual(cleanString, knownCleanString);
         }

UnitySDK/Assets/ML-Agents/Examples/SharedAssets/Materials/BlueAgent.mat

@@ -54,6 +54,10 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _SpecGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _BumpScale: 1
     - _Cutoff: 0.5
@@ -74,3 +78,4 @@ Material:
     m_Colors:
     - _Color: {r: 0.10980392, g: 0.6039216, b: 1, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}

UnitySDK/Assets/ML-Agents/Examples/SharedAssets/Materials/Wall.mat

@@ -54,6 +54,10 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _SpecGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _BumpScale: 1
     - _Cutoff: 0.5
@@ -74,3 +78,4 @@ Material:
     m_Colors:
     - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}