diff --git a/.gitignore b/.gitignore index 1a7b3d983f..ad6fdbcd64 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,9 @@ /UnitySDK/[Ll]ibrary/ +/UnitySDK/Logs/ /UnitySDK/[Tt]emp/ /UnitySDK/[Oo]bj/ /UnitySDK/[Bb]uild/ /UnitySDK/[Bb]uilds/ -/UnitySDK/[Pp]ackages/ /UnitySDK/Assets/AssetStoreTools* /UnitySDK/Assets/Plugins* /UnitySDK/Assets/Demonstrations* diff --git a/.yamato/csharp-tests.yml b/.yamato/csharp-tests.yml index 36053001e6..e2f61f1647 100644 --- a/.yamato/csharp-tests.yml +++ b/.yamato/csharp-tests.yml @@ -1,5 +1,4 @@ test_editors: - - version: 2017.4 - version: 2018.4 - version: 2019.3 --- @@ -8,7 +7,7 @@ test_mac_editmode_{{ editor.version }}: name: Test Mac EditMode {{ editor.version }} agent: type: Unity::VM::osx - image: ml-agents/ml-agents-bokken-mac:v0.1.2-440635 + image: ml-agents/ml-agents-bokken-mac:v0.1.3-475350 flavor: i1.small variables: UNITY_VERSION: {{ editor.version }} @@ -18,7 +17,6 @@ test_mac_editmode_{{ editor.version }}: pull_requests: - targets: only: - - "develop" - "master" - "/release-.*/" - "/hotfix-.*/" diff --git a/.yamato/standalone-build-test.yml b/.yamato/standalone-build-test.yml index 1bc2d68e27..d49ae16135 100644 --- a/.yamato/standalone-build-test.yml +++ b/.yamato/standalone-build-test.yml @@ -1,5 +1,4 @@ test_editors: - - version: 2017.4 - version: 2018.4 - version: 2019.3 --- @@ -8,7 +7,7 @@ test_mac_standalone_{{ editor.version }}: name: Test Mac Standalone {{ editor.version }} agent: type: Unity::VM::osx - image: ml-agents/ml-agents-bokken-mac:v0.1.2-440635 + image: ml-agents/ml-agents-bokken-mac:v0.1.3-475350 flavor: i1.small variables: UNITY_VERSION: {{ editor.version }} @@ -18,7 +17,6 @@ test_mac_standalone_{{ editor.version }}: pull_requests: - targets: only: - - "develop" - "master" - "/release-.*/" - "/hotfix-.*/" diff --git a/UnitySDK/Assets/ML-Agents/Editor/Tests/StandaloneBuildTest.cs b/UnitySDK/Assets/ML-Agents/Editor/Tests/StandaloneBuildTest.cs index 3acd01bd9a..e7bb7b9747 100644 --- a/UnitySDK/Assets/ML-Agents/Editor/Tests/StandaloneBuildTest.cs +++ b/UnitySDK/Assets/ML-Agents/Editor/Tests/StandaloneBuildTest.cs @@ -9,7 +9,7 @@ namespace MLAgents { public class StandaloneBuildTest { - static void BuildStandalonePlayerOSX() + public static void BuildStandalonePlayerOSX() { string[] scenes = { "Assets/ML-Agents/Examples/3DBall/Scenes/3DBall.unity" }; var buildResult = BuildPipeline.BuildPlayer(scenes, "testPlayer", BuildTarget.StandaloneOSX, BuildOptions.None); diff --git a/UnitySDK/Assets/ML-Agents/Examples/3DBall/TFModels/3DBall.nn.meta b/UnitySDK/Assets/ML-Agents/Examples/3DBall/TFModels/3DBall.nn.meta index e41069f62e..35fbc2987c 100644 --- a/UnitySDK/Assets/ML-Agents/Examples/3DBall/TFModels/3DBall.nn.meta +++ b/UnitySDK/Assets/ML-Agents/Examples/3DBall/TFModels/3DBall.nn.meta @@ -1,6 +1,9 @@ fileFormatVersion: 2 guid: 20a7b83be6b0c493d9271c65c897eb9b ScriptedImporter: + fileIDToRecycleName: + 11400000: main obj + externalObjects: {} userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/ML-Agents/Examples/3DBall/TFModels/3DBallHard.nn.meta b/UnitySDK/Assets/ML-Agents/Examples/3DBall/TFModels/3DBallHard.nn.meta index c44dcc43e6..f635cbcd75 100644 --- a/UnitySDK/Assets/ML-Agents/Examples/3DBall/TFModels/3DBallHard.nn.meta +++ b/UnitySDK/Assets/ML-Agents/Examples/3DBall/TFModels/3DBallHard.nn.meta @@ -1,6 +1,9 @@ fileFormatVersion: 2 guid: 27d49984757ed46b181090a532ef48e5 ScriptedImporter: + fileIDToRecycleName: + 11400000: main obj + externalObjects: {} userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/ML-Agents/Examples/Basic/TFModels/Basic.nn.meta b/UnitySDK/Assets/ML-Agents/Examples/Basic/TFModels/Basic.nn.meta index 5fc29a0f4f..c0c324b319 100644 --- a/UnitySDK/Assets/ML-Agents/Examples/Basic/TFModels/Basic.nn.meta +++ b/UnitySDK/Assets/ML-Agents/Examples/Basic/TFModels/Basic.nn.meta @@ -1,6 +1,9 @@ fileFormatVersion: 2 guid: 468c183196f1844f69e125c99dd135a1 ScriptedImporter: + fileIDToRecycleName: + 11400000: main obj + externalObjects: {} userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/ML-Agents/Examples/Bouncer/TFModels/Bouncer.nn.meta b/UnitySDK/Assets/ML-Agents/Examples/Bouncer/TFModels/Bouncer.nn.meta index 7bb7bc530f..9e485540a2 100644 --- a/UnitySDK/Assets/ML-Agents/Examples/Bouncer/TFModels/Bouncer.nn.meta +++ b/UnitySDK/Assets/ML-Agents/Examples/Bouncer/TFModels/Bouncer.nn.meta @@ -1,6 +1,9 @@ fileFormatVersion: 2 guid: 6c4ee6ab37d9b49b492a5cc49ed47ca0 ScriptedImporter: + fileIDToRecycleName: + 11400000: main obj + externalObjects: {} userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/ML-Agents/Examples/Crawler/TFModels/CrawlerDynamic.nn.meta b/UnitySDK/Assets/ML-Agents/Examples/Crawler/TFModels/CrawlerDynamic.nn.meta index f6a6afbf9f..4988943ab9 100644 --- a/UnitySDK/Assets/ML-Agents/Examples/Crawler/TFModels/CrawlerDynamic.nn.meta +++ b/UnitySDK/Assets/ML-Agents/Examples/Crawler/TFModels/CrawlerDynamic.nn.meta @@ -1,6 +1,9 @@ fileFormatVersion: 2 guid: 039557e683d584183a2a82cf8b1904c0 ScriptedImporter: + fileIDToRecycleName: + 11400000: main obj + externalObjects: {} userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/ML-Agents/Examples/Crawler/TFModels/CrawlerStatic.nn.meta b/UnitySDK/Assets/ML-Agents/Examples/Crawler/TFModels/CrawlerStatic.nn.meta index f24c7e348e..68d10bec4f 100644 --- a/UnitySDK/Assets/ML-Agents/Examples/Crawler/TFModels/CrawlerStatic.nn.meta +++ b/UnitySDK/Assets/ML-Agents/Examples/Crawler/TFModels/CrawlerStatic.nn.meta @@ -1,6 +1,9 @@ fileFormatVersion: 2 guid: ac4a23ff4713140198629ae0844926ee ScriptedImporter: + fileIDToRecycleName: + 11400000: main obj + externalObjects: {} userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/ML-Agents/Examples/FoodCollector/TFModels/FoodCollector.nn.meta b/UnitySDK/Assets/ML-Agents/Examples/FoodCollector/TFModels/FoodCollector.nn.meta index 3f0e2820ad..0077fe7693 100644 --- a/UnitySDK/Assets/ML-Agents/Examples/FoodCollector/TFModels/FoodCollector.nn.meta +++ b/UnitySDK/Assets/ML-Agents/Examples/FoodCollector/TFModels/FoodCollector.nn.meta @@ -1,6 +1,9 @@ fileFormatVersion: 2 guid: 36ab3e93020504f48858d0856f939685 ScriptedImporter: + fileIDToRecycleName: + 11400000: main obj + externalObjects: {} userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/ML-Agents/Examples/GridWorld/TFModels/GridWorld.nn.meta b/UnitySDK/Assets/ML-Agents/Examples/GridWorld/TFModels/GridWorld.nn.meta index c0ccd2699b..1a895bb0dd 100644 --- a/UnitySDK/Assets/ML-Agents/Examples/GridWorld/TFModels/GridWorld.nn.meta +++ b/UnitySDK/Assets/ML-Agents/Examples/GridWorld/TFModels/GridWorld.nn.meta @@ -1,6 +1,9 @@ fileFormatVersion: 2 guid: a812f1ce7763a4a0c912717f3594fe20 ScriptedImporter: + fileIDToRecycleName: + 11400000: main obj + externalObjects: {} userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/ML-Agents/Examples/Hallway/TFModels/Hallway.nn.meta b/UnitySDK/Assets/ML-Agents/Examples/Hallway/TFModels/Hallway.nn.meta index 400a019729..e70447ff57 100644 --- a/UnitySDK/Assets/ML-Agents/Examples/Hallway/TFModels/Hallway.nn.meta +++ b/UnitySDK/Assets/ML-Agents/Examples/Hallway/TFModels/Hallway.nn.meta @@ -1,6 +1,9 @@ fileFormatVersion: 2 guid: 317f4f8da7e4846b3aae0969781824a2 ScriptedImporter: + fileIDToRecycleName: + 11400000: main obj + externalObjects: {} userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/ML-Agents/Examples/PushBlock/TFModels/PushBlock.nn.meta b/UnitySDK/Assets/ML-Agents/Examples/PushBlock/TFModels/PushBlock.nn.meta index 94a49f41b3..6093c42de1 100644 --- a/UnitySDK/Assets/ML-Agents/Examples/PushBlock/TFModels/PushBlock.nn.meta +++ b/UnitySDK/Assets/ML-Agents/Examples/PushBlock/TFModels/PushBlock.nn.meta @@ -1,6 +1,9 @@ fileFormatVersion: 2 guid: 70db47ab276e44fe0beb677ff8d69382 ScriptedImporter: + fileIDToRecycleName: + 11400000: main obj + externalObjects: {} userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/ML-Agents/Examples/Pyramids/TFModels/Pyramids.nn.meta b/UnitySDK/Assets/ML-Agents/Examples/Pyramids/TFModels/Pyramids.nn.meta index 94b9ab0d3f..5de81df0ac 100644 --- a/UnitySDK/Assets/ML-Agents/Examples/Pyramids/TFModels/Pyramids.nn.meta +++ b/UnitySDK/Assets/ML-Agents/Examples/Pyramids/TFModels/Pyramids.nn.meta @@ -1,6 +1,9 @@ fileFormatVersion: 2 guid: aa3fa19a09ec44a41be3da037783ad41 ScriptedImporter: + fileIDToRecycleName: + 11400000: main obj + externalObjects: {} userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/ML-Agents/Examples/Reacher/TFModels/Reacher.nn.meta b/UnitySDK/Assets/ML-Agents/Examples/Reacher/TFModels/Reacher.nn.meta index c1f1f6382f..bff42e8827 100644 --- a/UnitySDK/Assets/ML-Agents/Examples/Reacher/TFModels/Reacher.nn.meta +++ b/UnitySDK/Assets/ML-Agents/Examples/Reacher/TFModels/Reacher.nn.meta @@ -1,6 +1,9 @@ fileFormatVersion: 2 guid: d7bdb6a78154f4cf99437d67e4a569a8 ScriptedImporter: + fileIDToRecycleName: + 11400000: main obj + externalObjects: {} userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/ML-Agents/Examples/SharedAssets/Materials/Textures/LogoCube.png.meta b/UnitySDK/Assets/ML-Agents/Examples/SharedAssets/Materials/Textures/LogoCube.png.meta index 2887aa8bc7..3ad0a748ea 100644 --- a/UnitySDK/Assets/ML-Agents/Examples/SharedAssets/Materials/Textures/LogoCube.png.meta +++ b/UnitySDK/Assets/ML-Agents/Examples/SharedAssets/Materials/Textures/LogoCube.png.meta @@ -3,7 +3,7 @@ guid: be5d24d9d9e024be784fbcb911cb18e8 TextureImporter: fileIDToRecycleName: {} externalObjects: {} - serializedVersion: 4 + serializedVersion: 9 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -21,6 +21,8 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -31,7 +33,7 @@ TextureImporter: serializedVersion: 2 filterMode: 1 aniso: -1 - mipBias: -1 + mipBias: -100 wrapU: 1 wrapV: 1 wrapW: -1 @@ -51,11 +53,13 @@ TextureImporter: spriteTessellationDetail: -1 textureType: 8 textureShape: 1 + singleChannelComponent: 0 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 platformSettings: - - buildTarget: DefaultTexturePlatform + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 1 textureFormat: -1 @@ -65,7 +69,8 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 - - buildTarget: Standalone + - serializedVersion: 2 + buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 1 textureFormat: -1 @@ -75,7 +80,8 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 - - buildTarget: iPhone + - serializedVersion: 2 + buildTarget: iPhone maxTextureSize: 2048 resizeAlgorithm: 1 textureFormat: -1 @@ -85,7 +91,8 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 - - buildTarget: Android + - serializedVersion: 2 + buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 1 textureFormat: -1 @@ -100,7 +107,15 @@ TextureImporter: sprites: [] outline: [] physicsShape: [] + bones: [] + spriteID: a3ff174ca5d764281aae23e2c354baca + vertices: [] + indices: + edges: [] + weights: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/ML-Agents/Examples/SharedAssets/Materials/Textures/UnityLogo.png.meta b/UnitySDK/Assets/ML-Agents/Examples/SharedAssets/Materials/Textures/UnityLogo.png.meta index 296d2451de..ab0294dd90 100644 --- a/UnitySDK/Assets/ML-Agents/Examples/SharedAssets/Materials/Textures/UnityLogo.png.meta +++ b/UnitySDK/Assets/ML-Agents/Examples/SharedAssets/Materials/Textures/UnityLogo.png.meta @@ -3,7 +3,7 @@ guid: 2e85738fe64714cffbf72f0f11de6307 TextureImporter: fileIDToRecycleName: {} externalObjects: {} - serializedVersion: 4 + serializedVersion: 9 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -21,6 +21,8 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -31,7 +33,7 @@ TextureImporter: serializedVersion: 2 filterMode: -1 aniso: -1 - mipBias: -1 + mipBias: -100 wrapU: 1 wrapV: 1 wrapW: -1 @@ -51,11 +53,13 @@ TextureImporter: spriteTessellationDetail: -1 textureType: 8 textureShape: 1 + singleChannelComponent: 0 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 platformSettings: - - buildTarget: DefaultTexturePlatform + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 @@ -65,7 +69,8 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 - - buildTarget: Standalone + - serializedVersion: 2 + buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 @@ -75,7 +80,8 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 - - buildTarget: iPhone + - serializedVersion: 2 + buildTarget: iPhone maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 @@ -85,7 +91,8 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 - - buildTarget: Android + - serializedVersion: 2 + buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 @@ -100,7 +107,15 @@ TextureImporter: sprites: [] outline: [] physicsShape: [] + bones: [] + spriteID: b33f877521c6d4d8782f018141dc1d6a + vertices: [] + indices: + edges: [] + weights: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/ML-Agents/Examples/Tennis/TFModels/Tennis.nn.meta b/UnitySDK/Assets/ML-Agents/Examples/Tennis/TFModels/Tennis.nn.meta index 4747e20af5..d35548b51d 100644 --- a/UnitySDK/Assets/ML-Agents/Examples/Tennis/TFModels/Tennis.nn.meta +++ b/UnitySDK/Assets/ML-Agents/Examples/Tennis/TFModels/Tennis.nn.meta @@ -1,6 +1,9 @@ fileFormatVersion: 2 guid: d6c5e749e4ceb4cf79640a5955706d3d ScriptedImporter: + fileIDToRecycleName: + 11400000: main obj + externalObjects: {} userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/ML-Agents/Examples/Walker/TFModels/Walker.nn.meta b/UnitySDK/Assets/ML-Agents/Examples/Walker/TFModels/Walker.nn.meta index f1806eff39..656841af9a 100644 --- a/UnitySDK/Assets/ML-Agents/Examples/Walker/TFModels/Walker.nn.meta +++ b/UnitySDK/Assets/ML-Agents/Examples/Walker/TFModels/Walker.nn.meta @@ -1,6 +1,9 @@ fileFormatVersion: 2 guid: 4e86a19e012da43bfa5ab97ae8089b98 ScriptedImporter: + fileIDToRecycleName: + 11400000: main obj + externalObjects: {} userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/ML-Agents/Examples/WallJump/TFModels/BigWallJump.nn.meta b/UnitySDK/Assets/ML-Agents/Examples/WallJump/TFModels/BigWallJump.nn.meta index 2e8ba394de..f687ec4c4e 100644 --- a/UnitySDK/Assets/ML-Agents/Examples/WallJump/TFModels/BigWallJump.nn.meta +++ b/UnitySDK/Assets/ML-Agents/Examples/WallJump/TFModels/BigWallJump.nn.meta @@ -1,6 +1,9 @@ fileFormatVersion: 2 guid: 0468bf44b1efd4992b6bf22cadb50d89 ScriptedImporter: + fileIDToRecycleName: + 11400000: main obj + externalObjects: {} userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/ML-Agents/Examples/WallJump/TFModels/SmallWallJump.nn.meta b/UnitySDK/Assets/ML-Agents/Examples/WallJump/TFModels/SmallWallJump.nn.meta index c92b03f555..0f2a4f2d23 100644 --- a/UnitySDK/Assets/ML-Agents/Examples/WallJump/TFModels/SmallWallJump.nn.meta +++ b/UnitySDK/Assets/ML-Agents/Examples/WallJump/TFModels/SmallWallJump.nn.meta @@ -1,6 +1,9 @@ fileFormatVersion: 2 guid: fb2ce36eb40b6480e94ea0b5d7573e47 ScriptedImporter: + fileIDToRecycleName: + 11400000: main obj + externalObjects: {} userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Packages/manifest.json b/UnitySDK/Packages/manifest.json new file mode 100644 index 0000000000..56af8e7f84 --- /dev/null +++ b/UnitySDK/Packages/manifest.json @@ -0,0 +1,41 @@ +{ + "dependencies": { + "com.unity.ads": "2.0.8", + "com.unity.analytics": "3.2.2", + "com.unity.collab-proxy": "1.2.15", + "com.unity.package-manager-ui": "2.0.8", + "com.unity.purchasing": "2.0.3", + "com.unity.textmeshpro": "1.4.1", + "com.unity.modules.ai": "1.0.0", + "com.unity.modules.animation": "1.0.0", + "com.unity.modules.assetbundle": "1.0.0", + "com.unity.modules.audio": "1.0.0", + "com.unity.modules.cloth": "1.0.0", + "com.unity.modules.director": "1.0.0", + "com.unity.modules.imageconversion": "1.0.0", + "com.unity.modules.imgui": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.particlesystem": "1.0.0", + "com.unity.modules.physics": "1.0.0", + "com.unity.modules.physics2d": "1.0.0", + "com.unity.modules.screencapture": "1.0.0", + "com.unity.modules.terrain": "1.0.0", + "com.unity.modules.terrainphysics": "1.0.0", + "com.unity.modules.tilemap": "1.0.0", + "com.unity.modules.ui": "1.0.0", + "com.unity.modules.uielements": "1.0.0", + "com.unity.modules.umbra": "1.0.0", + "com.unity.modules.unityanalytics": "1.0.0", + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.modules.unitywebrequestassetbundle": "1.0.0", + "com.unity.modules.unitywebrequestaudio": "1.0.0", + "com.unity.modules.unitywebrequesttexture": "1.0.0", + "com.unity.modules.unitywebrequestwww": "1.0.0", + "com.unity.modules.vehicles": "1.0.0", + "com.unity.modules.video": "1.0.0", + "com.unity.modules.vr": "1.0.0", + "com.unity.modules.wind": "1.0.0", + "com.unity.modules.xr": "1.0.0", + "com.unity.barracuda": "0.3.2-preview" + } +} diff --git a/UnitySDK/ProjectSettings/ProjectVersion.txt b/UnitySDK/ProjectSettings/ProjectVersion.txt index 2e959fabcf..4c21eea52f 100755 --- a/UnitySDK/ProjectSettings/ProjectVersion.txt +++ b/UnitySDK/ProjectSettings/ProjectVersion.txt @@ -1 +1 @@ -m_EditorVersion: 2017.4.33f1 +m_EditorVersion: 2018.4.14f1 diff --git a/UnitySDK/ProjectSettings/VFXManager.asset b/UnitySDK/ProjectSettings/VFXManager.asset new file mode 100644 index 0000000000..6e0eaca40d --- /dev/null +++ b/UnitySDK/ProjectSettings/VFXManager.asset @@ -0,0 +1,11 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!937362698 &1 +VFXManager: + m_ObjectHideFlags: 0 + m_IndirectShader: {fileID: 0} + m_CopyBufferShader: {fileID: 0} + m_SortShader: {fileID: 0} + m_RenderPipeSettingsPath: + m_FixedTimeStep: 0.016666668 + m_MaxDeltaTime: 0.05 diff --git a/UnitySDK/UnityPackageManager/manifest.json b/UnitySDK/UnityPackageManager/manifest.json deleted file mode 100644 index f1a80b4b48..0000000000 --- a/UnitySDK/UnityPackageManager/manifest.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "dependencies": { - "com.unity.barracuda": "0.3.2-preview" - } -} diff --git a/docs/Installation.md b/docs/Installation.md index 69ab41a5ff..47e7993859 100644 --- a/docs/Installation.md +++ b/docs/Installation.md @@ -4,7 +4,7 @@ To install and use ML-Agents, you need to install Unity, clone this repository a install Python with additional dependencies. Each of the subsections below overviews each step, in addition to a Docker set-up. -## Install **Unity 2017.4** or Later +## Install **Unity 2018.4** or Later [Download](https://store.unity.com/download) and install Unity. If you would like to use our Docker set-up (introduced later), make sure to select the _Linux @@ -43,10 +43,6 @@ to help you get started. If you intend to copy the `UnitySDK` folder in to your project, ensure that you have the [Barracuda preview package](https://docs.unity3d.com/Packages/com.unity.barracuda@0.3/manual/index.html) installed. -To install the Barracuda package in Unity **2017.4.x**, you will have to copy the -`UnityPackageManager` folder under the `UnitySDK` folder to the root directory of your -project. - To install the Barrcuda package in later versions of Unity, navigate to the Package Manager window by navigating to the menu `Window` -> `Package Manager`. Click on the `Adavanced` dropdown menu to the left of the search bar and make sure "Show Preview Packages" diff --git a/docs/Migrating.md b/docs/Migrating.md index 4a657a18fa..3f22cc7a53 100644 --- a/docs/Migrating.md +++ b/docs/Migrating.md @@ -19,6 +19,7 @@ The versions can be found in * Offline Behavioral Cloning has been removed. To learn from demonstrations, use the GAIL and Behavioral Cloning features with either PPO or SAC. See [Imitation Learning](Training-Imitation-Learning.md) for more information. * `mlagents.envs` was renamed to `mlagents_envs`. The previous repo layout depended on [PEP420](https://www.python.org/dev/peps/pep-0420/), which caused problems with some of our tooling such as mypy and pylint. +* The official version of Unity ML-Agents supports is now 2018.4 LTS. If you run into issues, please consider deleting your library folder and reponening your projects. You will need to install the Barracuda package into your project in order to ML-Agents to compile correctly. ### Steps to Migrate * If you had a custom `Training Configuration` in the Academy inspector, you will need to pass your custom configuration at every training run using the new command line arguments `--width`, `--height`, `--quality-level`, `--time-scale` and `--target-frame-rate`. diff --git a/docs/localized/KR/docs/Installation.md b/docs/localized/KR/docs/Installation.md index 80354847bf..1a54419543 100644 --- a/docs/localized/KR/docs/Installation.md +++ b/docs/localized/KR/docs/Installation.md @@ -4,7 +4,7 @@ ML-Agents를 설치하고 사용하기 위해 유니티를 설치해야 하고 Clone(복제)하고 추가종속성을 가지는 Python(파이썬)을 설치해야합니다. 아래 Subsection(하위섹션)에서는 Docker(도커) 설정 외에도 각 단계를 개괄적으로 설명합니다. -## **Unity 2017.4** 또는 이후의 버전을 설치하십시오. +## **Unity 2018.4** 또는 이후의 버전을 설치하십시오. [다운로드](https://store.unity.com/kr/download)하고 설치하십시오. 만약 저희의 도커 설정(차후에 소개할)을 사용하고 싶다면, 유니티를 설치할 때, Linux Build Support를 설정하십시오. @@ -101,4 +101,4 @@ ML-Agents와 관련된 문제가 발생하면 저희의 [FAQ](FAQ.md)와 [제약 ## 한글 번역 -해당 문서의 한글 번역은 [장현준 (Hyeonjun Jang)]([https://github.com/janghyeonjun](https://github.com/janghyeonjun))에 의해 진행되었습니다. 내용상 오류나 오탈자가 있는 경우 totok682@naver.com 으로 연락주시면 감사드리겠습니다. \ No newline at end of file +해당 문서의 한글 번역은 [장현준 (Hyeonjun Jang)]([https://github.com/janghyeonjun](https://github.com/janghyeonjun))에 의해 진행되었습니다. 내용상 오류나 오탈자가 있는 경우 totok682@naver.com 으로 연락주시면 감사드리겠습니다. diff --git a/run-tests-editmode-osx-editor.sh b/run-tests-editmode-osx-editor.sh index 6d6c1ae42d..55d2f0a4c0 100755 --- a/run-tests-editmode-osx-editor.sh +++ b/run-tests-editmode-osx-editor.sh @@ -30,7 +30,7 @@ else echo "Starting tests via $UNITY" - CMD_LINE="$UNITY -runTests -logfile - -projectPath $BASETPATH/UnitySDK -testResults $BASETPATH/results.xml -testPlatform editmode" + CMD_LINE="$UNITY -batchmode -runTests -logfile - -projectPath $BASETPATH/UnitySDK -testResults $BASETPATH/results.xml -testPlatform editmode" echo "$CMD_LINE ..."