From 227956e9b7204b3711b7ae585b0b9602436c8938 Mon Sep 17 00:00:00 2001 From: MaZiFAU <marco.alexander.zimmer@fau.de> Date: Tue, 12 Jul 2022 21:49:08 +0200 Subject: [PATCH] Upgrade to 2021.1.3.5f1 --- .../Editor/EasyRoads3Dv3Editor.dll | 2 +- .../PT_Medieval_texture.tga | 3 - .../PT_Medieval_texture.tga.meta | 77 ------------------- .../PT_Medieval_texture.tga | 3 - .../PT_Medieval_texture.tga.meta | 77 ------------------- .../PT_Medieval_texture.tga | 3 - .../PT_Medieval_texture.tga.meta | 77 ------------------- .../PT_Medieval_texture.tga | 3 - .../PT_Medieval_texture.tga.meta | 77 ------------------- .../PT_Medieval_texture.tga | 3 - .../PT_Medieval_texture.tga.meta | 77 ------------------- .../PT_Medieval_texture.tga | 3 - .../PT_Medieval_texture.tga.meta | 77 ------------------- .../2D/Sprites/RobotBoyCrouchSprite.png.meta | 31 +++++++- .../2D/Sprites/RobotBoyDeathSprite.png.meta | 37 ++++++++- .../2D/Sprites/RobotBoyIdleSprite.png.meta | 40 +++++++++- .../2D/Sprites/RobotBoyJumpSprite.png.meta | 36 ++++++++- .../2D/Sprites/RobotBoyRollSprite.png.meta | 34 +++++++- .../2D/Sprites/RobotBoyRunSprite.png.meta | 26 ++++++- .../2D/Sprites/RobotBoyWalkSprite.png.meta | 26 ++++++- Packages/manifest.json | 23 +++--- Packages/packages-lock.json | 62 +++++++-------- .../com.unity.probuilder/Settings.json | 9 ++- ProjectSettings/ProjectVersion.txt | 4 +- 24 files changed, 268 insertions(+), 542 deletions(-) delete mode 100644 Assets/Plugins/Polytope Studio/Lowpoly Medieval Characters/Sources/Meshes/PT_Medieval_Peasant_01_a.fbm/PT_Medieval_texture.tga delete mode 100644 Assets/Plugins/Polytope Studio/Lowpoly Medieval Characters/Sources/Meshes/PT_Medieval_Peasant_01_a.fbm/PT_Medieval_texture.tga.meta delete mode 100644 Assets/Plugins/Polytope Studio/Lowpoly Medieval Characters/Sources/Meshes/PT_Medieval_Peasant_01_b.fbm/PT_Medieval_texture.tga delete mode 100644 Assets/Plugins/Polytope Studio/Lowpoly Medieval Characters/Sources/Meshes/PT_Medieval_Peasant_01_b.fbm/PT_Medieval_texture.tga.meta delete mode 100644 Assets/Plugins/Polytope Studio/Lowpoly Medieval Characters/Sources/Meshes/PT_Medieval_Peasant_01_c.fbm/PT_Medieval_texture.tga delete mode 100644 Assets/Plugins/Polytope Studio/Lowpoly Medieval Characters/Sources/Meshes/PT_Medieval_Peasant_01_c.fbm/PT_Medieval_texture.tga.meta delete mode 100644 Assets/Plugins/Polytope Studio/Lowpoly Medieval Characters/Sources/Meshes/PT_Medieval_Peasant_01_d.fbm/PT_Medieval_texture.tga delete mode 100644 Assets/Plugins/Polytope Studio/Lowpoly Medieval Characters/Sources/Meshes/PT_Medieval_Peasant_01_d.fbm/PT_Medieval_texture.tga.meta delete mode 100644 Assets/Plugins/Polytope Studio/Lowpoly Medieval Characters/Sources/Meshes/PT_Medieval_Peasant_01_e.fbm/PT_Medieval_texture.tga delete mode 100644 Assets/Plugins/Polytope Studio/Lowpoly Medieval Characters/Sources/Meshes/PT_Medieval_Peasant_01_e.fbm/PT_Medieval_texture.tga.meta delete mode 100644 Assets/Plugins/Polytope Studio/Lowpoly Medieval Props/Sources/Meshes/PT_Medieval_Hayfork_01.fbm/PT_Medieval_texture.tga delete mode 100644 Assets/Plugins/Polytope Studio/Lowpoly Medieval Props/Sources/Meshes/PT_Medieval_Hayfork_01.fbm/PT_Medieval_texture.tga.meta diff --git a/Assets/Plugins/EasyRoads3D/Editor/EasyRoads3Dv3Editor.dll b/Assets/Plugins/EasyRoads3D/Editor/EasyRoads3Dv3Editor.dll index 1d59a3e6..40e57b76 100644 --- a/Assets/Plugins/EasyRoads3D/Editor/EasyRoads3Dv3Editor.dll +++ b/Assets/Plugins/EasyRoads3D/Editor/EasyRoads3Dv3Editor.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7c87771026be77d9a0633c97d847913568fd25087377d66c7058c951eb243222 +oid sha256:a6802833a3c87bfc857d71f1c3ae4773dac65af5512d290372c46e68bdcf7505 size 730624 diff --git a/Assets/Plugins/Polytope Studio/Lowpoly Medieval Characters/Sources/Meshes/PT_Medieval_Peasant_01_a.fbm/PT_Medieval_texture.tga b/Assets/Plugins/Polytope Studio/Lowpoly Medieval Characters/Sources/Meshes/PT_Medieval_Peasant_01_a.fbm/PT_Medieval_texture.tga deleted file mode 100644 index ab698a2e..00000000 --- a/Assets/Plugins/Polytope Studio/Lowpoly Medieval Characters/Sources/Meshes/PT_Medieval_Peasant_01_a.fbm/PT_Medieval_texture.tga +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8bb10e544269e8afd42181896e5b7aeb343af7e737d502de991433d95dd19fa2 -size 196652 diff --git a/Assets/Plugins/Polytope Studio/Lowpoly Medieval Characters/Sources/Meshes/PT_Medieval_Peasant_01_a.fbm/PT_Medieval_texture.tga.meta b/Assets/Plugins/Polytope Studio/Lowpoly Medieval Characters/Sources/Meshes/PT_Medieval_Peasant_01_a.fbm/PT_Medieval_texture.tga.meta deleted file mode 100644 index 2a552c8a..00000000 --- a/Assets/Plugins/Polytope Studio/Lowpoly Medieval Characters/Sources/Meshes/PT_Medieval_Peasant_01_a.fbm/PT_Medieval_texture.tga.meta +++ /dev/null @@ -1,77 +0,0 @@ -fileFormatVersion: 2 -guid: ff21cc58efed5f14dad1771512912707 -timeCreated: 1557473723 -licenseType: Store -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 4 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -1 - wrapU: -1 - wrapV: -1 - wrapW: -1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spritePixelsToUnits: 100 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - spritePackingTag: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/Polytope Studio/Lowpoly Medieval Characters/Sources/Meshes/PT_Medieval_Peasant_01_b.fbm/PT_Medieval_texture.tga b/Assets/Plugins/Polytope Studio/Lowpoly Medieval Characters/Sources/Meshes/PT_Medieval_Peasant_01_b.fbm/PT_Medieval_texture.tga deleted file mode 100644 index ab698a2e..00000000 --- a/Assets/Plugins/Polytope Studio/Lowpoly Medieval Characters/Sources/Meshes/PT_Medieval_Peasant_01_b.fbm/PT_Medieval_texture.tga +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8bb10e544269e8afd42181896e5b7aeb343af7e737d502de991433d95dd19fa2 -size 196652 diff --git a/Assets/Plugins/Polytope Studio/Lowpoly Medieval Characters/Sources/Meshes/PT_Medieval_Peasant_01_b.fbm/PT_Medieval_texture.tga.meta b/Assets/Plugins/Polytope Studio/Lowpoly Medieval Characters/Sources/Meshes/PT_Medieval_Peasant_01_b.fbm/PT_Medieval_texture.tga.meta deleted file mode 100644 index 4d4f4656..00000000 --- a/Assets/Plugins/Polytope Studio/Lowpoly Medieval Characters/Sources/Meshes/PT_Medieval_Peasant_01_b.fbm/PT_Medieval_texture.tga.meta +++ /dev/null @@ -1,77 +0,0 @@ -fileFormatVersion: 2 -guid: d88116c360676964ebf949a8e63daf12 -timeCreated: 1557473723 -licenseType: Store -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 4 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -1 - wrapU: -1 - wrapV: -1 - wrapW: -1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spritePixelsToUnits: 100 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - spritePackingTag: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/Polytope Studio/Lowpoly Medieval Characters/Sources/Meshes/PT_Medieval_Peasant_01_c.fbm/PT_Medieval_texture.tga b/Assets/Plugins/Polytope Studio/Lowpoly Medieval Characters/Sources/Meshes/PT_Medieval_Peasant_01_c.fbm/PT_Medieval_texture.tga deleted file mode 100644 index ab698a2e..00000000 --- a/Assets/Plugins/Polytope Studio/Lowpoly Medieval Characters/Sources/Meshes/PT_Medieval_Peasant_01_c.fbm/PT_Medieval_texture.tga +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8bb10e544269e8afd42181896e5b7aeb343af7e737d502de991433d95dd19fa2 -size 196652 diff --git a/Assets/Plugins/Polytope Studio/Lowpoly Medieval Characters/Sources/Meshes/PT_Medieval_Peasant_01_c.fbm/PT_Medieval_texture.tga.meta b/Assets/Plugins/Polytope Studio/Lowpoly Medieval Characters/Sources/Meshes/PT_Medieval_Peasant_01_c.fbm/PT_Medieval_texture.tga.meta deleted file mode 100644 index d9bdadc9..00000000 --- a/Assets/Plugins/Polytope Studio/Lowpoly Medieval Characters/Sources/Meshes/PT_Medieval_Peasant_01_c.fbm/PT_Medieval_texture.tga.meta +++ /dev/null @@ -1,77 +0,0 @@ -fileFormatVersion: 2 -guid: abeadddde4f8afe429c027cd0851eb8a -timeCreated: 1557473723 -licenseType: Store -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 4 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -1 - wrapU: -1 - wrapV: -1 - wrapW: -1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spritePixelsToUnits: 100 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - spritePackingTag: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/Polytope Studio/Lowpoly Medieval Characters/Sources/Meshes/PT_Medieval_Peasant_01_d.fbm/PT_Medieval_texture.tga b/Assets/Plugins/Polytope Studio/Lowpoly Medieval Characters/Sources/Meshes/PT_Medieval_Peasant_01_d.fbm/PT_Medieval_texture.tga deleted file mode 100644 index ab698a2e..00000000 --- a/Assets/Plugins/Polytope Studio/Lowpoly Medieval Characters/Sources/Meshes/PT_Medieval_Peasant_01_d.fbm/PT_Medieval_texture.tga +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8bb10e544269e8afd42181896e5b7aeb343af7e737d502de991433d95dd19fa2 -size 196652 diff --git a/Assets/Plugins/Polytope Studio/Lowpoly Medieval Characters/Sources/Meshes/PT_Medieval_Peasant_01_d.fbm/PT_Medieval_texture.tga.meta b/Assets/Plugins/Polytope Studio/Lowpoly Medieval Characters/Sources/Meshes/PT_Medieval_Peasant_01_d.fbm/PT_Medieval_texture.tga.meta deleted file mode 100644 index 8a810b80..00000000 --- a/Assets/Plugins/Polytope Studio/Lowpoly Medieval Characters/Sources/Meshes/PT_Medieval_Peasant_01_d.fbm/PT_Medieval_texture.tga.meta +++ /dev/null @@ -1,77 +0,0 @@ -fileFormatVersion: 2 -guid: ce5c01bec92d8d444a69b73fd1287fa0 -timeCreated: 1557473723 -licenseType: Store -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 4 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -1 - wrapU: -1 - wrapV: -1 - wrapW: -1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spritePixelsToUnits: 100 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - spritePackingTag: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/Polytope Studio/Lowpoly Medieval Characters/Sources/Meshes/PT_Medieval_Peasant_01_e.fbm/PT_Medieval_texture.tga b/Assets/Plugins/Polytope Studio/Lowpoly Medieval Characters/Sources/Meshes/PT_Medieval_Peasant_01_e.fbm/PT_Medieval_texture.tga deleted file mode 100644 index ab698a2e..00000000 --- a/Assets/Plugins/Polytope Studio/Lowpoly Medieval Characters/Sources/Meshes/PT_Medieval_Peasant_01_e.fbm/PT_Medieval_texture.tga +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8bb10e544269e8afd42181896e5b7aeb343af7e737d502de991433d95dd19fa2 -size 196652 diff --git a/Assets/Plugins/Polytope Studio/Lowpoly Medieval Characters/Sources/Meshes/PT_Medieval_Peasant_01_e.fbm/PT_Medieval_texture.tga.meta b/Assets/Plugins/Polytope Studio/Lowpoly Medieval Characters/Sources/Meshes/PT_Medieval_Peasant_01_e.fbm/PT_Medieval_texture.tga.meta deleted file mode 100644 index 4c9bfb35..00000000 --- a/Assets/Plugins/Polytope Studio/Lowpoly Medieval Characters/Sources/Meshes/PT_Medieval_Peasant_01_e.fbm/PT_Medieval_texture.tga.meta +++ /dev/null @@ -1,77 +0,0 @@ -fileFormatVersion: 2 -guid: 502d9ee9b0ab6a645a36a65da2cd8c2f -timeCreated: 1557473723 -licenseType: Store -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 4 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -1 - wrapU: -1 - wrapV: -1 - wrapW: -1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spritePixelsToUnits: 100 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - spritePackingTag: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/Polytope Studio/Lowpoly Medieval Props/Sources/Meshes/PT_Medieval_Hayfork_01.fbm/PT_Medieval_texture.tga b/Assets/Plugins/Polytope Studio/Lowpoly Medieval Props/Sources/Meshes/PT_Medieval_Hayfork_01.fbm/PT_Medieval_texture.tga deleted file mode 100644 index ab698a2e..00000000 --- a/Assets/Plugins/Polytope Studio/Lowpoly Medieval Props/Sources/Meshes/PT_Medieval_Hayfork_01.fbm/PT_Medieval_texture.tga +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8bb10e544269e8afd42181896e5b7aeb343af7e737d502de991433d95dd19fa2 -size 196652 diff --git a/Assets/Plugins/Polytope Studio/Lowpoly Medieval Props/Sources/Meshes/PT_Medieval_Hayfork_01.fbm/PT_Medieval_texture.tga.meta b/Assets/Plugins/Polytope Studio/Lowpoly Medieval Props/Sources/Meshes/PT_Medieval_Hayfork_01.fbm/PT_Medieval_texture.tga.meta deleted file mode 100644 index 70b37c1f..00000000 --- a/Assets/Plugins/Polytope Studio/Lowpoly Medieval Props/Sources/Meshes/PT_Medieval_Hayfork_01.fbm/PT_Medieval_texture.tga.meta +++ /dev/null @@ -1,77 +0,0 @@ -fileFormatVersion: 2 -guid: 268ba0f10916cdb4ca436d6afcafe4d2 -timeCreated: 1554286784 -licenseType: Store -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 4 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -1 - wrapU: -1 - wrapV: -1 - wrapW: -1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spritePixelsToUnits: 100 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - spritePackingTag: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Standard Assets/2D/Sprites/RobotBoyCrouchSprite.png.meta b/Assets/Standard Assets/2D/Sprites/RobotBoyCrouchSprite.png.meta index cdb01a96..4d7753ac 100644 --- a/Assets/Standard Assets/2D/Sprites/RobotBoyCrouchSprite.png.meta +++ b/Assets/Standard Assets/2D/Sprites/RobotBoyCrouchSprite.png.meta @@ -86,6 +86,8 @@ TextureImporter: isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -94,9 +96,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 + filterMode: 1 aniso: 1 - mipBias: -100 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -117,9 +119,12 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 applyGammaDecoding: 1 platformSettings: - serializedVersion: 3 @@ -636,6 +641,28 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: + RobotBoyCrouch17: 21300034 + RobotBoyCrouch03: 21300006 + RobotBoyCrouch07: 21300014 + RobotBoyCrouch04: 21300008 + RobotBoyCrouch13: 21300026 + RobotBoyCrouch20: 21300040 + RobotBoyCrouch02: 21300004 + RobotBoyCrouch01: 21300002 + RobotBoyCrouch15: 21300030 + RobotBoyCrouch05: 21300010 + RobotBoyCrouch19: 21300038 + RobotBoyCrouch11: 21300022 + RobotBoyCrouch06: 21300012 + RobotBoyCrouch18: 21300036 + RobotBoyCrouch00: 21300000 + RobotBoyCrouch08: 21300016 + RobotBoyCrouch14: 21300028 + RobotBoyCrouch10: 21300020 + RobotBoyCrouch16: 21300032 + RobotBoyCrouch09: 21300018 + RobotBoyCrouch12: 21300024 spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/Standard Assets/2D/Sprites/RobotBoyDeathSprite.png.meta b/Assets/Standard Assets/2D/Sprites/RobotBoyDeathSprite.png.meta index 496ed81f..942c6899 100644 --- a/Assets/Standard Assets/2D/Sprites/RobotBoyDeathSprite.png.meta +++ b/Assets/Standard Assets/2D/Sprites/RobotBoyDeathSprite.png.meta @@ -104,6 +104,8 @@ TextureImporter: isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -112,9 +114,9 @@ TextureImporter: maxTextureSize: 1024 textureSettings: serializedVersion: 2 - filterMode: -1 + filterMode: 1 aniso: 1 - mipBias: -100 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -135,9 +137,12 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 applyGammaDecoding: 1 platformSettings: - serializedVersion: 3 @@ -780,6 +785,34 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: + RobotBoyDeath04: 21300008 + RobotBoyDeath02: 21300004 + RobotBoyDeath05: 21300010 + RobotBoyDeath11: 21300022 + RobotBoyDeath18: 21300036 + RobotBoyDeath22: 21300044 + RobotBoyDeath03: 21300006 + RobotBoyDeath20: 21300040 + RobotBoyDeath07: 21300014 + RobotBoyDeath01: 21300002 + RobotBoyDeath24: 21300048 + RobotBoyDeath10: 21300020 + RobotBoyDeath25: 21300050 + RobotBoyDeath13: 21300026 + RobotBoyDeath23: 21300046 + RobotBoyDeath19: 21300038 + RobotBoyDeath17: 21300034 + RobotBoyDeath21: 21300042 + RobotBoyDeath06: 21300012 + RobotBoyDeath16: 21300032 + RobotBoyDeath15: 21300030 + RobotBoyDeath14: 21300028 + RobotBoyDeath12: 21300024 + RobotBoyDeath26: 21300052 + RobotBoyDeath09: 21300018 + RobotBoyDeath00: 21300000 + RobotBoyDeath08: 21300016 spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/Standard Assets/2D/Sprites/RobotBoyIdleSprite.png.meta b/Assets/Standard Assets/2D/Sprites/RobotBoyIdleSprite.png.meta index 0c6c6583..f85cc040 100644 --- a/Assets/Standard Assets/2D/Sprites/RobotBoyIdleSprite.png.meta +++ b/Assets/Standard Assets/2D/Sprites/RobotBoyIdleSprite.png.meta @@ -113,6 +113,8 @@ TextureImporter: isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -121,9 +123,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 + filterMode: 1 aniso: 1 - mipBias: -100 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -144,9 +146,12 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 applyGammaDecoding: 1 platformSettings: - serializedVersion: 3 @@ -852,6 +857,37 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: + RobotBoyIdle14: 21300028 + RobotBoyIdle25: 21300050 + RobotBoyIdle26: 21300052 + RobotBoyIdle06: 21300012 + RobotBoyIdle21: 21300042 + RobotBoyIdle28: 21300056 + RobotBoyIdle02: 21300004 + RobotBoyIdle05: 21300010 + RobotBoyIdle10: 21300020 + RobotBoyIdle29: 21300058 + RobotBoyIdle27: 21300054 + RobotBoyIdle22: 21300044 + RobotBoyIdle01: 21300002 + RobotBoyIdle15: 21300030 + RobotBoyIdle16: 21300032 + RobotBoyIdle12: 21300024 + RobotBoyIdle11: 21300022 + RobotBoyIdle08: 21300016 + RobotBoyIdle03: 21300006 + RobotBoyIdle17: 21300034 + RobotBoyIdle23: 21300046 + RobotBoyIdle13: 21300026 + RobotBoyIdle07: 21300014 + RobotBoyIdle20: 21300040 + RobotBoyIdle04: 21300008 + RobotBoyIdle19: 21300038 + RobotBoyIdle00: 21300000 + RobotBoyIdle18: 21300036 + RobotBoyIdle24: 21300048 + RobotBoyIdle09: 21300018 spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/Standard Assets/2D/Sprites/RobotBoyJumpSprite.png.meta b/Assets/Standard Assets/2D/Sprites/RobotBoyJumpSprite.png.meta index b631a5da..b90ce3e0 100644 --- a/Assets/Standard Assets/2D/Sprites/RobotBoyJumpSprite.png.meta +++ b/Assets/Standard Assets/2D/Sprites/RobotBoyJumpSprite.png.meta @@ -101,6 +101,8 @@ TextureImporter: isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -109,9 +111,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 + filterMode: 1 aniso: 1 - mipBias: -100 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -132,9 +134,12 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 applyGammaDecoding: 1 platformSettings: - serializedVersion: 3 @@ -756,6 +761,33 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: + RobotBoyJump05: 21300010 + RobotBoyJump11: 21300022 + RobotBoyJump08: 21300016 + RobotBoyJump18: 21300036 + RobotBoyJump12: 21300024 + RobotBoyJump07: 21300014 + RobotBoyJump22: 21300044 + RobotBoyJump04: 21300008 + RobotBoyJump10: 21300020 + RobotBoyJump01: 21300002 + RobotBoyJump20: 21300040 + RobotBoyJump14: 21300028 + RobotBoyJump17: 21300034 + RobotBoyJump03: 21300006 + RobotBoyJump09: 21300018 + RobotBoyJump21: 21300042 + RobotBoyJump02: 21300004 + RobotBoyJump15: 21300030 + RobotBoyJump13: 21300026 + RobotBoyJump16: 21300032 + RobotBoyJump19: 21300038 + RobotBoyJump24: 21300048 + RobotBoyJump00: 21300000 + RobotBoyJump06: 21300012 + RobotBoyJump23: 21300046 + RobotBoyJump25: 21300050 spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/Standard Assets/2D/Sprites/RobotBoyRollSprite.png.meta b/Assets/Standard Assets/2D/Sprites/RobotBoyRollSprite.png.meta index ba730205..62b74472 100644 --- a/Assets/Standard Assets/2D/Sprites/RobotBoyRollSprite.png.meta +++ b/Assets/Standard Assets/2D/Sprites/RobotBoyRollSprite.png.meta @@ -95,6 +95,8 @@ TextureImporter: isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -103,9 +105,9 @@ TextureImporter: maxTextureSize: 1024 textureSettings: serializedVersion: 2 - filterMode: -1 + filterMode: 1 aniso: 1 - mipBias: -100 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -126,9 +128,12 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 applyGammaDecoding: 1 platformSettings: - serializedVersion: 3 @@ -708,6 +713,31 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: + RobotBoyRoll01: 21300002 + RobotBoyRoll21: 21300042 + RobotBoyRoll09: 21300018 + RobotBoyRoll10: 21300020 + RobotBoyRoll02: 21300004 + RobotBoyRoll06: 21300012 + RobotBoyRoll23: 21300046 + RobotBoyRoll03: 21300006 + RobotBoyRoll16: 21300032 + RobotBoyRoll20: 21300040 + RobotBoyRoll08: 21300016 + RobotBoyRoll17: 21300034 + RobotBoyRoll12: 21300024 + RobotBoyRoll15: 21300030 + RobotBoyRoll05: 21300010 + RobotBoyRoll22: 21300044 + RobotBoyRoll07: 21300014 + RobotBoyRoll00: 21300000 + RobotBoyRoll13: 21300026 + RobotBoyRoll04: 21300008 + RobotBoyRoll18: 21300036 + RobotBoyRoll19: 21300038 + RobotBoyRoll11: 21300022 + RobotBoyRoll14: 21300028 spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/Standard Assets/2D/Sprites/RobotBoyRunSprite.png.meta b/Assets/Standard Assets/2D/Sprites/RobotBoyRunSprite.png.meta index 431a5ebd..aeb1901f 100644 --- a/Assets/Standard Assets/2D/Sprites/RobotBoyRunSprite.png.meta +++ b/Assets/Standard Assets/2D/Sprites/RobotBoyRunSprite.png.meta @@ -71,6 +71,8 @@ TextureImporter: isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -79,9 +81,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 + filterMode: 1 aniso: 1 - mipBias: -100 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -102,9 +104,12 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 applyGammaDecoding: 1 platformSettings: - serializedVersion: 3 @@ -516,6 +521,23 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: + RobotBoyRun13: 21300026 + RobotBoyRun08: 21300016 + RobotBoyRun05: 21300010 + RobotBoyRun09: 21300018 + RobotBoyRun11: 21300022 + RobotBoyRun02: 21300004 + RobotBoyRun12: 21300024 + RobotBoyRun10: 21300020 + RobotBoyRun03: 21300006 + RobotBoyRun15: 21300030 + RobotBoyRun14: 21300028 + RobotBoyRun07: 21300014 + RobotBoyRun01: 21300002 + RobotBoyRun04: 21300008 + RobotBoyRun00: 21300000 + RobotBoyRun06: 21300012 spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/Standard Assets/2D/Sprites/RobotBoyWalkSprite.png.meta b/Assets/Standard Assets/2D/Sprites/RobotBoyWalkSprite.png.meta index c7d70080..3b0ff8b0 100644 --- a/Assets/Standard Assets/2D/Sprites/RobotBoyWalkSprite.png.meta +++ b/Assets/Standard Assets/2D/Sprites/RobotBoyWalkSprite.png.meta @@ -71,6 +71,8 @@ TextureImporter: isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -79,9 +81,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 + filterMode: 1 aniso: 1 - mipBias: -100 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -102,9 +104,12 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 applyGammaDecoding: 1 platformSettings: - serializedVersion: 3 @@ -516,6 +521,23 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: + RobotBoyWalk10: 21300020 + RobotBoyWalk13: 21300026 + RobotBoyWalk06: 21300012 + RobotBoyWalk09: 21300018 + RobotBoyWalk00: 21300000 + RobotBoyWalk11: 21300022 + RobotBoyWalk01: 21300002 + RobotBoyWalk12: 21300024 + RobotBoyWalk02: 21300004 + RobotBoyWalk07: 21300014 + RobotBoyWalk04: 21300008 + RobotBoyWalk14: 21300028 + RobotBoyWalk03: 21300006 + RobotBoyWalk05: 21300010 + RobotBoyWalk08: 21300016 + RobotBoyWalk15: 21300030 spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Packages/manifest.json b/Packages/manifest.json index d04985ef..ae3aaf73 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -3,23 +3,22 @@ "com.unity.2d.sprite": "1.0.0", "com.unity.2d.tilemap": "1.0.0", "com.unity.ads": "3.7.5", - "com.unity.analytics": "3.6.11", - "com.unity.cinemachine": "2.6.11", - "com.unity.collab-proxy": "1.11.2", - "com.unity.ide.rider": "2.0.7", + "com.unity.analytics": "3.6.12", + "com.unity.cinemachine": "2.8.6", + "com.unity.collab-proxy": "1.15.18", + "com.unity.ide.rider": "3.0.14", "com.unity.ide.visualstudio": "2.0.16", - "com.unity.ide.vscode": "1.2.4", + "com.unity.ide.vscode": "1.2.5", "com.unity.inputsystem": "1.3.0", - "com.unity.multiplayer-hlapi": "1.0.8", - "com.unity.nuget.newtonsoft-json": "2.0.0", - "com.unity.probuilder": "4.2.1", - "com.unity.purchasing": "3.2.2", - "com.unity.test-framework": "1.1.29", + "com.unity.nuget.newtonsoft-json": "3.0.2", + "com.unity.probuilder": "5.0.3", + "com.unity.purchasing": "4.1.5", + "com.unity.test-framework": "1.1.31", "com.unity.textmeshpro": "3.0.6", - "com.unity.timeline": "1.4.8", + "com.unity.timeline": "1.6.4", "com.unity.toolchain.win-x86_64-linux-x86_64": "0.1.21-preview", "com.unity.ugui": "1.0.0", - "com.unity.xr.legacyinputhelpers": "2.1.8", + "com.unity.xr.legacyinputhelpers": "2.1.9", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", "com.unity.modules.animation": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 0aeff378..6c66d956 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -22,7 +22,7 @@ "url": "https://packages.unity.com" }, "com.unity.analytics": { - "version": "3.6.11", + "version": "3.6.12", "depth": 0, "source": "registry", "dependencies": { @@ -31,17 +31,19 @@ "url": "https://packages.unity.com" }, "com.unity.cinemachine": { - "version": "2.6.11", + "version": "2.8.6", "depth": 0, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.collab-proxy": { - "version": "1.11.2", + "version": "1.15.18", "depth": 0, "source": "registry", - "dependencies": {}, + "dependencies": { + "com.unity.services.core": "1.0.1" + }, "url": "https://packages.unity.com" }, "com.unity.ext.nunit": { @@ -52,11 +54,11 @@ "url": "https://packages.unity.com" }, "com.unity.ide.rider": { - "version": "2.0.7", + "version": "3.0.14", "depth": 0, "source": "registry", "dependencies": { - "com.unity.test-framework": "1.1.1" + "com.unity.ext.nunit": "1.0.6" }, "url": "https://packages.unity.com" }, @@ -70,7 +72,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.vscode": { - "version": "1.2.4", + "version": "1.2.5", "depth": 0, "source": "registry", "dependencies": {}, @@ -85,33 +87,26 @@ }, "url": "https://packages.unity.com" }, - "com.unity.multiplayer-hlapi": { - "version": "1.0.8", - "depth": 0, - "source": "registry", - "dependencies": { - "nuget.mono-cecil": "0.1.6-preview" - }, - "url": "https://packages.unity.com" - }, "com.unity.nuget.newtonsoft-json": { - "version": "2.0.0", + "version": "3.0.2", "depth": 0, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.probuilder": { - "version": "4.2.1", + "version": "5.0.3", "depth": 0, "source": "registry", "dependencies": { - "com.unity.settings-manager": "1.0.0" + "com.unity.settings-manager": "1.0.3", + "com.unity.modules.physics": "1.0.0", + "com.unity.modules.imgui": "1.0.0" }, "url": "https://packages.unity.com" }, "com.unity.purchasing": { - "version": "3.2.2", + "version": "4.1.5", "depth": 0, "source": "registry", "dependencies": { @@ -119,12 +114,24 @@ "com.unity.modules.unityanalytics": "1.0.0", "com.unity.modules.unitywebrequest": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.androidjni": "1.0.0", + "com.unity.services.core": "1.0.1" + }, + "url": "https://packages.unity.com" + }, + "com.unity.services.core": { + "version": "1.4.0", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.nuget.newtonsoft-json": "3.0.2", "com.unity.modules.androidjni": "1.0.0" }, "url": "https://packages.unity.com" }, "com.unity.settings-manager": { - "version": "1.0.0", + "version": "1.0.3", "depth": 1, "source": "registry", "dependencies": {}, @@ -147,7 +154,7 @@ "url": "https://packages.unity.com" }, "com.unity.test-framework": { - "version": "1.1.29", + "version": "1.1.31", "depth": 0, "source": "registry", "dependencies": { @@ -167,7 +174,7 @@ "url": "https://packages.unity.com" }, "com.unity.timeline": { - "version": "1.4.8", + "version": "1.6.4", "depth": 0, "source": "registry", "dependencies": { @@ -198,7 +205,7 @@ } }, "com.unity.xr.legacyinputhelpers": { - "version": "2.1.8", + "version": "2.1.9", "depth": 0, "source": "registry", "dependencies": { @@ -207,13 +214,6 @@ }, "url": "https://packages.unity.com" }, - "nuget.mono-cecil": { - "version": "0.1.6-preview", - "depth": 1, - "source": "registry", - "dependencies": {}, - "url": "https://packages.unity.com" - }, "com.unity.modules.ai": { "version": "1.0.0", "depth": 0, diff --git a/ProjectSettings/Packages/com.unity.probuilder/Settings.json b/ProjectSettings/Packages/com.unity.probuilder/Settings.json index 43a95dd6..d5a927d2 100644 --- a/ProjectSettings/Packages/com.unity.probuilder/Settings.json +++ b/ProjectSettings/Packages/com.unity.probuilder/Settings.json @@ -21,12 +21,12 @@ { "type": "UnityEngine.ProBuilder.SemVer, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", "key": "about.identifier", - "value": "{\"m_Value\":{\"m_Major\":4,\"m_Minor\":2,\"m_Patch\":1,\"m_Build\":-1,\"m_Type\":\"\",\"m_Metadata\":\"\",\"m_Date\":\"\"}}" + "value": "{\"m_Value\":{\"m_Major\":5,\"m_Minor\":0,\"m_Patch\":3,\"m_Build\":-1,\"m_Type\":\"\",\"m_Metadata\":\"\",\"m_Date\":\"\"}}" }, { "type": "UnityEngine.ProBuilder.SemVer, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", "key": "preferences.version", - "value": "{\"m_Value\":{\"m_Major\":4,\"m_Minor\":2,\"m_Patch\":1,\"m_Build\":-1,\"m_Type\":\"\",\"m_Metadata\":\"\",\"m_Date\":\"\"}}" + "value": "{\"m_Value\":{\"m_Major\":5,\"m_Minor\":0,\"m_Patch\":3,\"m_Build\":-1,\"m_Type\":\"\",\"m_Metadata\":\"\",\"m_Date\":\"\"}}" }, { "type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", @@ -42,6 +42,11 @@ "type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", "key": "editor.autoRecalculateCollisions", "value": "{\"m_Value\":false}" + }, + { + "type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", + "key": "experimental.enabled", + "value": "{\"m_Value\":false}" } ] } diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index cec2ec90..bdb3ba5f 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2020.3.20f1 -m_EditorVersionWithRevision: 2020.3.20f1 (41c4e627c95f) +m_EditorVersion: 2021.3.5f1 +m_EditorVersionWithRevision: 2021.3.5f1 (40eb3a945986) -- GitLab