Skip to content
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

Updated input system to 1.3.0 #5661

Merged
merged 2 commits into from
Jan 6, 2022
Merged

Updated input system to 1.3.0 #5661

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
94a8ff3
Updated input system to 1.3.0
miguelalonsojr Jan 5, 2022
c0e3983
Updated DevProject to Input System 1.3.0.
miguelalonsojr Jan 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion DevProject/Packages/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"dependencies": {
"com.unity.coding": "0.1.0-preview.13",
"com.unity.inputsystem": "1.1.0-preview.3",
"com.unity.inputsystem": "1.3.0",
"com.unity.ml-agents": "file:../../com.unity.ml-agents",
"com.unity.ml-agents.extensions": "file:../../com.unity.ml-agents.extensions",
"com.unity.package-manager-doctools": "1.7.0-preview",
Expand Down
10 changes: 6 additions & 4 deletions DevProject/Packages/packages-lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
"depth": 1,
"source": "registry",
"dependencies": {
"com.unity.burst": "1.3.4",
"com.unity.burst": "1.6.0",
"com.unity.modules.jsonserialize": "1.0.0",
"com.unity.modules.imageconversion": "1.0.0"
},
"url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates"
},
"com.unity.burst": {
"version": "1.3.4",
"version": "1.6.0",
"depth": 2,
"source": "registry",
"dependencies": {
Expand All @@ -37,10 +37,12 @@
"url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates"
},
"com.unity.inputsystem": {
"version": "1.1.0-preview.3",
"version": "1.3.0",
"depth": 0,
"source": "registry",
"dependencies": {},
"dependencies": {
"com.unity.modules.uielements": "1.0.0"
},
"url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates"
},
"com.unity.mathematics": {
Expand Down
8 changes: 5 additions & 3 deletions Project/Assets/ML-Agents/Examples/PushBlockWithInput/Scripts/PushBlockActions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was auto-generated by com.unity.inputsystem:InputActionCodeGenerator
// version 1.1.0
// version 1.3.0
// from Assets/ML-Agents/Examples/PushBlockWithInput/PushBlockActions.inputactions
//
// Changes to this file may cause incorrect behavior and will be lost if
Expand Down Expand Up @@ -33,15 +33,17 @@ public @PushBlockActions()
""id"": ""5f47cbc6-de46-4d33-93e2-2b1af4f5996d"",
""expectedControlType"": ""Vector2"",
""processors"": """",
""interactions"": """"
""interactions"": """",
""initialStateCheck"": true
},
{
""name"": ""jump"",
""type"": ""Button"",
""id"": ""ca5eb833-5dfb-4b7c-880d-6118bd5d1378"",
""expectedControlType"": ""Button"",
""processors"": """",
""interactions"": """"
""interactions"": """",
""initialStateCheck"": false
}
],
""bindings"": [
Expand Down
2 changes: 1 addition & 1 deletion Project/Packages/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"dependencies": {
"com.unity.ide.rider": "3.0.5",
"com.unity.inputsystem": "1.1.0-preview.3",
"com.unity.inputsystem": "1.3.0",
"com.unity.ml-agents": "file:../../com.unity.ml-agents",
"com.unity.ml-agents.extensions": "file:../../com.unity.ml-agents.extensions",
"com.unity.nuget.newtonsoft-json": "2.0.0",
Expand Down
10 changes: 6 additions & 4 deletions Project/Packages/packages-lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
"depth": 1,
"source": "registry",
"dependencies": {
"com.unity.burst": "1.3.4",
"com.unity.burst": "1.6.0",
"com.unity.modules.jsonserialize": "1.0.0",
"com.unity.modules.imageconversion": "1.0.0"
},
"url": "https://packages.unity.com"
},
"com.unity.burst": {
"version": "1.3.4",
"version": "1.6.0",
"depth": 2,
"source": "registry",
"dependencies": {
Expand All @@ -35,10 +35,12 @@
"url": "https://packages.unity.com"
},
"com.unity.inputsystem": {
"version": "1.1.0-preview.3",
"version": "1.3.0",
"depth": 0,
"source": "registry",
"dependencies": {},
"dependencies": {
"com.unity.modules.uielements": "1.0.0"
},
"url": "https://packages.unity.com"
},
"com.unity.mathematics": {
Expand Down
2 changes: 1 addition & 1 deletion com.unity.ml-agents.extensions/Runtime/Input/Unity.ML-Agents.Extensions.Input.asmdef
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"versionDefines": [
{
"name": "com.unity.inputsystem",
"expression": "1.1.0-preview.3",
"expression": "1.3.0",
"define": "MLA_INPUT_SYSTEM"
}
],
Expand Down