From 17007a13b62e7f8ef164578d5ee3a8edf8cb9e74 Mon Sep 17 00:00:00 2001 From: Melvyn May Date: Mon, 21 Jun 2021 16:04:05 +0100 Subject: [PATCH 1/6] Update to 2020.3.12f1 --- Packages/manifest.json | 37 +------- Packages/packages-lock.json | 88 ++++++++++++++++++++ ProjectSettings/PackageManagerSettings.asset | 43 ++++++++++ ProjectSettings/ProjectVersion.txt | 4 +- 4 files changed, 137 insertions(+), 35 deletions(-) create mode 100644 Packages/packages-lock.json create mode 100644 ProjectSettings/PackageManagerSettings.asset diff --git a/Packages/manifest.json b/Packages/manifest.json index ac25c18..4cd765d 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,38 +1,9 @@ { "dependencies": { - "com.unity.ide.rider": "1.2.1", - "com.unity.ide.visualstudio": "2.0.0", - "com.unity.textmeshpro": "3.0.0-preview.1", - "com.unity.modules.ai": "1.0.0", - "com.unity.modules.androidjni": "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.ide.rider": "2.0.7", + "com.unity.ide.visualstudio": "2.0.8", + "com.unity.textmeshpro": "3.0.6", "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.modules.physics2d": "1.0.0" } } diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json new file mode 100644 index 0000000..2da6646 --- /dev/null +++ b/Packages/packages-lock.json @@ -0,0 +1,88 @@ +{ + "dependencies": { + "com.unity.ext.nunit": { + "version": "1.0.6", + "depth": 2, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.ide.rider": { + "version": "2.0.7", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.test-framework": "1.1.1" + }, + "url": "https://packages.unity.com" + }, + "com.unity.ide.visualstudio": { + "version": "2.0.8", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.test-framework": "1.1.9" + }, + "url": "https://packages.unity.com" + }, + "com.unity.test-framework": { + "version": "1.1.24", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.ext.nunit": "1.0.6", + "com.unity.modules.imgui": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.textmeshpro": { + "version": "3.0.6", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.ugui": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.ugui": { + "version": "1.0.0", + "depth": 1, + "source": "builtin", + "dependencies": { + "com.unity.modules.ui": "1.0.0", + "com.unity.modules.imgui": "1.0.0" + } + }, + "com.unity.modules.imgui": { + "version": "1.0.0", + "depth": 2, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.jsonserialize": { + "version": "1.0.0", + "depth": 2, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.particlesystem": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.physics2d": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.ui": { + "version": "1.0.0", + "depth": 2, + "source": "builtin", + "dependencies": {} + } + } +} diff --git a/ProjectSettings/PackageManagerSettings.asset b/ProjectSettings/PackageManagerSettings.asset new file mode 100644 index 0000000..be4a797 --- /dev/null +++ b/ProjectSettings/PackageManagerSettings.asset @@ -0,0 +1,43 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &1 +MonoBehaviour: + m_ObjectHideFlags: 61 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 13964, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_EnablePreviewPackages: 0 + m_EnablePackageDependencies: 0 + m_AdvancedSettingsExpanded: 1 + m_ScopedRegistriesSettingsExpanded: 1 + oneTimeWarningShown: 0 + m_Registries: + - m_Id: main + m_Name: + m_Url: https://packages.unity.com + m_Scopes: [] + m_IsDefault: 1 + m_Capabilities: 7 + m_UserSelectedRegistryName: + m_UserAddingNewScopedRegistry: 0 + m_RegistryInfoDraft: + m_ErrorMessage: + m_Original: + m_Id: + m_Name: + m_Url: + m_Scopes: [] + m_IsDefault: 0 + m_Capabilities: 0 + m_Modified: 0 + m_Name: + m_Url: + m_Scopes: + - + m_SelectedScopeIndex: 0 diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index c3d0e81..79c71bc 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2020.1.0b3 -m_EditorVersionWithRevision: 2020.1.0b3 (6955a944264e) +m_EditorVersion: 2020.3.12f1 +m_EditorVersionWithRevision: 2020.3.12f1 (b3b2c6512326) From aa4c772e2d2db4e2ea9238f412adaefe05ccd7bb Mon Sep 17 00:00:00 2001 From: Melvyn May Date: Mon, 21 Jun 2021 16:18:42 +0100 Subject: [PATCH 2/6] Minor update to project settings. --- Packages/manifest.json | 2 +- Packages/packages-lock.json | 24 +++--------------------- 2 files changed, 4 insertions(+), 22 deletions(-) diff --git a/Packages/manifest.json b/Packages/manifest.json index 4cd765d..5d4423a 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -2,7 +2,7 @@ "dependencies": { "com.unity.ide.rider": "2.0.7", "com.unity.ide.visualstudio": "2.0.8", - "com.unity.textmeshpro": "3.0.6", + "com.unity.modules.audio": "1.0.0", "com.unity.modules.particlesystem": "1.0.0", "com.unity.modules.physics2d": "1.0.0" } diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 2da6646..6de362d 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -36,23 +36,11 @@ }, "url": "https://packages.unity.com" }, - "com.unity.textmeshpro": { - "version": "3.0.6", - "depth": 0, - "source": "registry", - "dependencies": { - "com.unity.ugui": "1.0.0" - }, - "url": "https://packages.unity.com" - }, - "com.unity.ugui": { + "com.unity.modules.audio": { "version": "1.0.0", - "depth": 1, + "depth": 0, "source": "builtin", - "dependencies": { - "com.unity.modules.ui": "1.0.0", - "com.unity.modules.imgui": "1.0.0" - } + "dependencies": {} }, "com.unity.modules.imgui": { "version": "1.0.0", @@ -77,12 +65,6 @@ "depth": 0, "source": "builtin", "dependencies": {} - }, - "com.unity.modules.ui": { - "version": "1.0.0", - "depth": 2, - "source": "builtin", - "dependencies": {} } } } From f2cbe8294aee0948b26c3d4fa32461e4f4e128d9 Mon Sep 17 00:00:00 2001 From: Melvyn May Date: Wed, 24 Aug 2022 12:17:09 +0100 Subject: [PATCH 3/6] Update Readme.md --- Readme.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Readme.md b/Readme.md index 337daf7..fe3333c 100644 --- a/Readme.md +++ b/Readme.md @@ -1,7 +1,9 @@ # 2D Physics Examples -This project contains multiple scenes which are designed to provide both examples of features as well as having the additional benefit that they can be used by QA. +This project contains multiple scenes which are designed to provide both examples of features as well as having the additional benefit that they can be used by Unity QA or developers who want to test that specific features are working away from their projects. -Where a new feature is introduced into the project, a new branch will be introduced. Earlier Unity versions are therefore represented in branches. +A lot of the scenes rely on Gizmos for presentation of Colliders, Joints, Contacts (etc) so please ensure that the "Gizmos" buttons are selected in both the "Scene" and "Game" views otherwise you may find you cannot see the content. + +Where a new feature is introduced into the project, a new branch will be introduced when the Unity version that feature landed has become public in at least a Beta version. Earlier Unity versions are therefore represented in branches. Twitter: https://twitter.com/melvmay Unity Forum: https://forum.unity.com/members/melvmay.287484/ From bc711e31f092a21464f0be9631e6a8ff3855afca Mon Sep 17 00:00:00 2001 From: Melvyn May Date: Fri, 16 Sep 2022 09:50:27 +0100 Subject: [PATCH 4/6] Enable the build-in Animation module required for animations in some examples. --- Packages/manifest.json | 1 + Packages/packages-lock.json | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/Packages/manifest.json b/Packages/manifest.json index 5d4423a..55171cc 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -3,6 +3,7 @@ "com.unity.ide.rider": "2.0.7", "com.unity.ide.visualstudio": "2.0.8", "com.unity.modules.audio": "1.0.0", + "com.unity.modules.animation": "1.0.0", "com.unity.modules.particlesystem": "1.0.0", "com.unity.modules.physics2d": "1.0.0" } diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 6de362d..2d64f60 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -42,6 +42,12 @@ "source": "builtin", "dependencies": {} }, + "com.unity.modules.animation": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, "com.unity.modules.imgui": { "version": "1.0.0", "depth": 2, From 729eb3954bbaba1292af4eafd782864a30f3f35f Mon Sep 17 00:00:00 2001 From: Melvyn May Date: Thu, 17 Nov 2022 10:41:22 +0000 Subject: [PATCH 5/6] Update the ReadMe. --- Readme.md | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Readme.md b/Readme.md index fe3333c..f09d405 100644 --- a/Readme.md +++ b/Readme.md @@ -1,9 +1,13 @@ # 2D Physics Examples -This project contains multiple scenes which are designed to provide both examples of features as well as having the additional benefit that they can be used by Unity QA or developers who want to test that specific features are working away from their projects. +This project contains multiple scenes that are designed to provide both examples of features as well as having the additional benefit that they can be used by Unity QA or developers who wish to test/verify that specific features are working. -A lot of the scenes rely on Gizmos for presentation of Colliders, Joints, Contacts (etc) so please ensure that the "Gizmos" buttons are selected in both the "Scene" and "Game" views otherwise you may find you cannot see the content. +A majority of the scenes rely on Unity Gizmos for presentation of Colliders, Joints, Contacts (etc) rather than renderers so please ensure that the "Gizmos" buttons are selected in both the "Scene" and "Game" views otherwise you may find you cannot see the content. -Where a new feature is introduced into the project, a new branch will be introduced when the Unity version that feature landed has become public in at least a Beta version. Earlier Unity versions are therefore represented in branches. +## Branch Names + +Each branch represents a specific version of Unity. As features are added in a public release, those features should be represented in that branch and future Unity version branches i.e. branch names of "2019", "2020", "2021" (etc) exist. + +"master" represents the current latest alpha/beta version of Unity, updated only when new 2D physics features land in a public alpha/beta release. When the latest alpha/beta transitions into a final release, a branch of that Unity version name will be created and "master" will become the next alpha/beta release. Twitter: https://twitter.com/melvmay Unity Forum: https://forum.unity.com/members/melvmay.287484/ From f5167fd5513158fcba3352f1af5dd1b87249e94c Mon Sep 17 00:00:00 2001 From: Melvyn May Date: Sat, 14 Sep 2024 09:21:37 +0100 Subject: [PATCH 6/6] Update Readme --- Readme.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Readme.md b/Readme.md index f09d405..971816a 100644 --- a/Readme.md +++ b/Readme.md @@ -3,6 +3,10 @@ This project contains multiple scenes that are designed to provide both examples A majority of the scenes rely on Unity Gizmos for presentation of Colliders, Joints, Contacts (etc) rather than renderers so please ensure that the "Gizmos" buttons are selected in both the "Scene" and "Game" views otherwise you may find you cannot see the content. +## Game View + +All the examples were designed with the Game window set to 16:9 Aspect. It is recommended that you change the Game window to this so that the Camera correctly displays the examples. + ## Branch Names Each branch represents a specific version of Unity. As features are added in a public release, those features should be represented in that branch and future Unity version branches i.e. branch names of "2019", "2020", "2021" (etc) exist.