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.

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

PR: Feature => Master #19

Merged
merged 3 commits into from
Feb 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 8 additions & 0 deletions Assets/All scenes/Level 3.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Assets/All scenes/Level 3.unity
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ LightmapSettings:
m_ExportTrainingData: 0
m_TrainingDataDestination: TrainingData
m_LightProbeSampleCountMultiplier: 4
m_LightingDataAsset: {fileID: 0}
m_LightingDataAsset: {fileID: 112000000, guid: d28284be8823593468b63ca8bcae5af6, type: 2}
m_LightingSettings: {fileID: 0}
--- !u!196 &4
NavMeshSettings:
Expand Down
Binary file added Assets/All scenes/Level 3/LightingData.asset
Binary file not shown.
8 changes: 8 additions & 0 deletions Assets/All scenes/Level 3/LightingData.asset.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added Assets/WSATestCertificate.pfx
Binary file not shown.
7 changes: 7 additions & 0 deletions Assets/WSATestCertificate.pfx.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 8 additions & 8 deletions Packages/manifest.json
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
{
"dependencies": {
"com.unity.2d.animation": "10.0.2",
"com.unity.2d.animation": "10.0.3",
"com.unity.2d.pixel-perfect": "5.0.3",
"com.unity.2d.psdimporter": "9.0.0",
"com.unity.2d.psdimporter": "9.0.1",
"com.unity.2d.sprite": "1.0.0",
"com.unity.2d.spriteshape": "10.0.1",
"com.unity.2d.spriteshape": "10.0.2",
"com.unity.2d.tilemap": "1.0.0",
"com.unity.adaptiveperformance": "5.0.2",
"com.unity.ai.navigation": "1.1.4",
"com.unity.ai.navigation": "1.1.5",
"com.unity.collab-proxy": "2.0.7",
"com.unity.ide.rider": "3.0.24",
"com.unity.ide.visualstudio": "2.0.20",
"com.unity.postprocessing": "3.2.2",
"com.unity.ide.rider": "3.0.27",
"com.unity.ide.visualstudio": "2.0.22",
"com.unity.postprocessing": "3.3.0",
"com.unity.render-pipelines.universal": "16.0.1",
"com.unity.timeline": "1.8.4",
"com.unity.timeline": "1.8.6",
"com.unity.ugui": "2.0.0",
"com.unity.modules.ai": "1.0.0",
"com.unity.modules.androidjni": "1.0.0",
Expand Down
26 changes: 13 additions & 13 deletions Packages/packages-lock.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"dependencies": {
"com.unity.2d.animation": {
"version": "10.0.2",
"version": "10.0.3",
"depth": 0,
"source": "registry",
"dependencies": {
"com.unity.2d.common": "9.0.1",
"com.unity.2d.common": "9.0.2",
"com.unity.2d.sprite": "1.0.0",
"com.unity.collections": "1.2.4",
"com.unity.modules.animation": "1.0.0",
Expand All @@ -14,15 +14,15 @@
"url": "https://packages.unity.com"
},
"com.unity.2d.common": {
"version": "9.0.1",
"version": "9.0.2",
"depth": 1,
"source": "registry",
"dependencies": {
"com.unity.2d.sprite": "1.0.0",
"com.unity.mathematics": "1.1.0",
"com.unity.modules.uielements": "1.0.0",
"com.unity.modules.animation": "1.0.0",
"com.unity.burst": "1.8.3"
"com.unity.burst": "1.8.4"
},
"url": "https://packages.unity.com"
},
Expand All @@ -34,11 +34,11 @@
"url": "https://packages.unity.com"
},
"com.unity.2d.psdimporter": {
"version": "9.0.0",
"version": "9.0.1",
"depth": 0,
"source": "registry",
"dependencies": {
"com.unity.2d.common": "9.0.0",
"com.unity.2d.common": "9.0.2",
"com.unity.2d.sprite": "1.0.0"
},
"url": "https://packages.unity.com"
Expand All @@ -50,12 +50,12 @@
"dependencies": {}
},
"com.unity.2d.spriteshape": {
"version": "10.0.1",
"version": "10.0.2",
"depth": 0,
"source": "registry",
"dependencies": {
"com.unity.mathematics": "1.1.0",
"com.unity.2d.common": "9.0.1",
"com.unity.2d.common": "9.0.2",
"com.unity.modules.physics2d": "1.0.0"
},
"url": "https://packages.unity.com"
Expand All @@ -79,7 +79,7 @@
"url": "https://packages.unity.com"
},
"com.unity.ai.navigation": {
"version": "1.1.4",
"version": "1.1.5",
"depth": 0,
"source": "registry",
"dependencies": {
Expand Down Expand Up @@ -121,7 +121,7 @@
"url": "https://packages.unity.com"
},
"com.unity.ide.rider": {
"version": "3.0.24",
"version": "3.0.27",
"depth": 0,
"source": "registry",
"dependencies": {
Expand All @@ -130,7 +130,7 @@
"url": "https://packages.unity.com"
},
"com.unity.ide.visualstudio": {
"version": "2.0.20",
"version": "2.0.22",
"depth": 0,
"source": "registry",
"dependencies": {
Expand All @@ -146,7 +146,7 @@
"url": "https://packages.unity.com"
},
"com.unity.postprocessing": {
"version": "3.2.2",
"version": "3.3.0",
"depth": 0,
"source": "registry",
"dependencies": {
Expand Down Expand Up @@ -212,7 +212,7 @@
"url": "https://packages.unity.com"
},
"com.unity.timeline": {
"version": "1.8.4",
"version": "1.8.6",
"depth": 0,
"source": "registry",
"dependencies": {
Expand Down
8 changes: 4 additions & 4 deletions ProjectSettings/ProjectSettings.asset
Original file line number Diff line number Diff line change
Expand Up @@ -830,11 +830,11 @@ PlayerSettings:
m_MobileRenderingPath: 1
metroPackageName: 2DBuiltInRenderer
metroPackageVersion: 1.0.0.0
metroCertificatePath:
metroCertificatePath: Assets/WSATestCertificate.pfx
metroCertificatePassword:
metroCertificateSubject:
metroCertificateIssuer:
metroCertificateNotAfter: 0000000000000000
metroCertificateSubject: DefaultCompany
metroCertificateIssuer: DefaultCompany
metroCertificateNotAfter: 00e27198087edb01
metroApplicationDescription: 2D_BuiltInRenderer
wsaImages: {}
metroTileShortName: Assignment 2
Expand Down