Merge remote-tracking branch 'origin/master' into develop-onnx-prototype

Author: Chris Elion

.yamato/com.unity.ml-agents-test.yml

@@ -34,11 +34,10 @@ test_{{ platform.name }}_{{ editor.version }}:
   dependencies:
     - .yamato/com.unity.ml-agents-pack.yml#pack
   triggers:
-    pull_requests:
-      - targets:
-          only:
-            - "master"
-            - "/release-.*/"
-            - "/hotfix-.*/"
+    changes:
+      only:
+        - "com.unity.ml-agents/**"
+        - ".yamato/com.unity.ml-agents-test.yml"
+
   {% endfor %}
   {% endfor %}

.yamato/standalone-build-test.yml

@@ -15,10 +15,13 @@ test_mac_standalone_{{ editor.version }}:
     - pip install pyyaml
     - python -u -m ml-agents.tests.yamato.standalone_build_tests
   triggers:
-    pull_requests:
-      - targets:
-          only:
-            - "master"
-            - "/release-.*/"
-            - "/hotfix-.*/"
+    changes:
+      only:
+        - "com.unity.ml-agents/**"
+        - "Project/**"
+        - ".yamato/standalone-build-test.yml"
+      except:
+        - "*.md"
+        - "com.unity.ml-agents/*.md"
+        - "com.unity.ml-agents/**/*.md"
 {% endfor %}

.yamato/training-int-tests.yml

@@ -15,12 +15,17 @@ test_mac_training_int_{{ editor.version }}:
     - pip install pyyaml
     - python -u -m ml-agents.tests.yamato.training_int_tests
   triggers:
-    pull_requests:
-      - targets:
-          only:
-            - "master"
-            - "/release-.*/"
-            - "/hotfix-.*/"
+    changes:
+      only:
+        - "com.unity.ml-agents/**"
+        - "Project/**"
+        - "ml-agents/**"
+        - "ml-agents-envs/**"
+        - ".yamato/training-int-tests.yml"
+      except:
+        - "*.md"
+        - "com.unity.ml-agents/*.md"
+        - "com.unity.ml-agents/**/*.md"
   artifacts:
     unit:
       paths:

Project/Assets/ML-Agents/Examples/3DBall/TFModels/3DBall.nn

@@ -2187,7 +2187,7 @@ MonoBehaviour:
   m_BehaviorType: 0
   m_BehaviorName: FoodCollector
   m_TeamID: 0
-  m_useChildSensors: 1
+  m_UseChildSensors: 1
 --- !u!114 &114176228333253036
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -2436,6 +2436,7 @@ GameObject:
   - component: {fileID: 114522573150607728}
   - component: {fileID: 114711827726849508}
   - component: {fileID: 114443152683847924}
+  - component: {fileID: 259154752087955944}
   m_Layer: 0
   m_Name: Agent (1)
   m_TagString: agent
@@ -2511,7 +2512,7 @@ MonoBehaviour:
   m_BehaviorType: 0
   m_BehaviorName: FoodCollector
   m_TeamID: 0
-  m_useChildSensors: 1
+  m_UseChildSensors: 1
 --- !u!114 &114711827726849508
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -2524,7 +2525,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: c66e6845309d241c78a6d77ee2567928, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  maxStep: 0
+  maxStep: 5000
   area: {fileID: 1819751139121548}
   turnSpeed: 300
   moveSpeed: 2
@@ -2567,6 +2568,21 @@ MonoBehaviour:
   useWorldPositions: 1
   startVerticalOffset: 0
   endVerticalOffset: 0
+--- !u!114 &259154752087955944
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1495617568563208}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3a5c9d521e5ef4759a8246a07d52221e, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  DecisionPeriod: 5
+  RepeatAction: 1
+  offsetStep: 0
 --- !u!1 &1528397385587768
 GameObject:
   m_ObjectHideFlags: 0
@@ -2749,6 +2765,7 @@ GameObject:
   - component: {fileID: 114980787530065684}
   - component: {fileID: 114542632553128056}
   - component: {fileID: 114986980423924774}
+  - component: {fileID: 5519119940433428255}
   m_Layer: 0
   m_Name: Agent (2)
   m_TagString: agent
@@ -2824,7 +2841,7 @@ MonoBehaviour:
   m_BehaviorType: 0
   m_BehaviorName: FoodCollector
   m_TeamID: 0
-  m_useChildSensors: 1
+  m_UseChildSensors: 1
 --- !u!114 &114542632553128056
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -2837,7 +2854,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: c66e6845309d241c78a6d77ee2567928, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  maxStep: 0
+  maxStep: 5000
   area: {fileID: 1819751139121548}
   turnSpeed: 300
   moveSpeed: 2
@@ -2880,6 +2897,21 @@ MonoBehaviour:
   useWorldPositions: 1
   startVerticalOffset: 0
   endVerticalOffset: 0
+--- !u!114 &5519119940433428255
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1601500200010266}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3a5c9d521e5ef4759a8246a07d52221e, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  DecisionPeriod: 5
+  RepeatAction: 1
+  offsetStep: 0
 --- !u!1 &1617924810425504
 GameObject:
   m_ObjectHideFlags: 0
@@ -3325,6 +3357,7 @@ GameObject:
   - component: {fileID: 114878550018296316}
   - component: {fileID: 114189751434580810}
   - component: {fileID: 114644889237473510}
+  - component: {fileID: 5884750436653390196}
   m_Layer: 0
   m_Name: Agent (4)
   m_TagString: agent
@@ -3400,7 +3433,7 @@ MonoBehaviour:
   m_BehaviorType: 0
   m_BehaviorName: FoodCollector
   m_TeamID: 0
-  m_useChildSensors: 1
+  m_UseChildSensors: 1
 --- !u!114 &114189751434580810
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -3413,7 +3446,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: c66e6845309d241c78a6d77ee2567928, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  maxStep: 0
+  maxStep: 5000
   area: {fileID: 1819751139121548}
   turnSpeed: 300
   moveSpeed: 2
@@ -3456,6 +3489,21 @@ MonoBehaviour:
   useWorldPositions: 1
   startVerticalOffset: 0
   endVerticalOffset: 0
+--- !u!114 &5884750436653390196
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1672905243433088}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3a5c9d521e5ef4759a8246a07d52221e, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  DecisionPeriod: 5
+  RepeatAction: 1
+  offsetStep: 0
 --- !u!1 &1688105343773098
 GameObject:
   m_ObjectHideFlags: 0
@@ -3624,6 +3672,7 @@ GameObject:
   - component: {fileID: 114035338027591536}
   - component: {fileID: 114235147148547996}
   - component: {fileID: 114276061479012222}
+  - component: {fileID: 4768752321433982785}
   m_Layer: 0
   m_Name: Agent (3)
   m_TagString: agent
@@ -3699,7 +3748,7 @@ MonoBehaviour:
   m_BehaviorType: 0
   m_BehaviorName: FoodCollector
   m_TeamID: 0
-  m_useChildSensors: 1
+  m_UseChildSensors: 1
 --- !u!114 &114235147148547996
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -3712,7 +3761,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: c66e6845309d241c78a6d77ee2567928, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  maxStep: 0
+  maxStep: 5000
   area: {fileID: 1819751139121548}
   turnSpeed: 300
   moveSpeed: 2
@@ -3755,6 +3804,21 @@ MonoBehaviour:
   useWorldPositions: 1
   startVerticalOffset: 0
   endVerticalOffset: 0
+--- !u!114 &4768752321433982785
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1706274796045088}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3a5c9d521e5ef4759a8246a07d52221e, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  DecisionPeriod: 5
+  RepeatAction: 1
+  offsetStep: 0
 --- !u!1 &1729825611722018
 GameObject:
   m_ObjectHideFlags: 0