Skip to content

feat: update to editor version 2022.3 LTS [MTT-6341] #840

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

Merged
merged 36 commits into from
Jun 7, 2023
Merged

feat: update to editor version 2022.3 LTS [MTT-6341] #840

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
dfcdf4a
updating to editor version 2022.2
LPLafontaineB Apr 28, 2023
a827674
removing unneeded monobehaviours to fix null refs
LPLafontaineB Apr 28, 2023
606eeae
changelog
LPLafontaineB May 10, 2023
f41171a
updating tests to run on 2022.2
LPLafontaineB May 10, 2023
7f515c6
updating to tools 2.0.0-pre.2
LPLafontaineB May 10, 2023
657d992
removing CI workaround
LPLafontaineB May 10, 2023
45c75db
Merge branch 'develop' into feat/update-to-2022-lts
LPLafontaineB May 10, 2023
063e441
using another image for standards check job
LPLafontaineB May 19, 2023
b84ea7f
fixing typo
LPLafontaineB May 19, 2023
b990039
trying another image
LPLafontaineB May 19, 2023
89078e0
using latest logging-testing-linux image
LPLafontaineB May 19, 2023
2eb22d1
using larger job flavor for standards check
LPLafontaineB May 23, 2023
2757cf9
test
LPLafontaineB May 24, 2023
7060dc4
test
LPLafontaineB May 24, 2023
27701a6
Adding console log for debugging
LPLafontaineB May 25, 2023
cc81e13
increasing verbosity for debugging
LPLafontaineB May 26, 2023
d51e482
returning to old image, but keeping bigger flavor
LPLafontaineB May 26, 2023
41f404a
cleaning up
LPLafontaineB May 26, 2023
d3b38f5
Merge branch 'develop' into feat/update-to-2022-lts
LPLafontaineB May 26, 2023
bb7c3f7
update to 2022.2.21
LPLafontaineB May 29, 2023
cbc29c0
new urp settings
LPLafontaineB May 29, 2023
6a6a486
updating test editor to 2022.3 for CI
LPLafontaineB May 31, 2023
7baf0a0
updating to 2022.3 lts
LPLafontaineB May 31, 2023
0299b28
updating changelog and readme
LPLafontaineB May 31, 2023
152294a
Update README.md
LPLafontaineB May 31, 2023
56f65b8
updating settings
LPLafontaineB May 31, 2023
49a0ce6
Merge branch 'feat/update-to-2022-lts' of https://github.com/Unity-Te…
LPLafontaineB May 31, 2023
fbd97d9
upgraded to tools pre.3
LPLafontaineB Jun 1, 2023
7a714ed
using more recent bokken image for ios builds
LPLafontaineB Jun 1, 2023
8f7183c
moving editor link to download page
LPLafontaineB Jun 5, 2023
4778342
updating bokken images to recommended ones
LPLafontaineB Jun 5, 2023
48ed14e
Merge branch 'develop' into feat/update-to-2022-lts
LPLafontaineB Jun 5, 2023
e4fe153
fixing typo
LPLafontaineB Jun 5, 2023
e8485e7
fixing readme issues
LPLafontaineB Jun 5, 2023
95d7df5
shader updates / fixes
jilfranco-unity Jun 6, 2023
01520b6
rebaked lighting to fix artifacts on the lava pits in front of the door
jilfranco-unity Jun 6, 2023
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
6 changes: 3 additions & 3 deletions .yamato/mobile-build-and-run.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ Build_Player_With_Tests_iOS_{{ project.name }}_{{ editor }}:
name: build {{ project.name }} - {{ editor }} on iOS
agent:
type: Unity::VM::osx
image: mobile/macos-10.15-testing:stable
image: package-ci/macos-12:v4
flavor: b1.large

commands:
- pip install unity-downloader-cli==1.2.0 --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
- unity-downloader-cli -c Editor -c iOS -u 2021.3.15f1 --fast --wait
- unity-downloader-cli -c Editor -c iOS -u {{ editor }} --fast --wait
- curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr
- chmod +x ./utr
- ./utr --suite=playmode --platform=iOS --editor-location=.Editor --testproject={{ project.path }} --player-save-path=build/players --artifacts_path=build/logs --build-only --testfilter=Unity.BossRoom.Tests.Runtime
Expand Down Expand Up @@ -70,7 +70,7 @@ mobile_test_ios_{{ project.name }}_{{ editor }}:
name: {{ project.name }} mobile project tests - {{ editor }} on iOS
agent:
type: Unity::mobile::iPhone
image: mobile/macos-10.15-testing:latest
image: package-ci/macos-12:v4
flavor: b1.medium

# Skip repository cloning
Expand Down
2 changes: 1 addition & 1 deletion .yamato/project-standards.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ standards_{{ projects.first.name }}:
agent:
type: Unity::VM
image: desktop/logging-testing-linux:v0.1.2-926285
flavor: b1.medium
flavor: b1.large
commands:
- dotnet --version
- dotnet format --version
Expand Down
13 changes: 5 additions & 8 deletions .yamato/project.metafile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,20 @@
validation_editor: 2020.3

# Platforms that will be tested. The first entry in this array will also
# be used for validation
# Platforms that will be tested.
test_platforms:
- name: win
type: Unity::VM
image: package-ci/win10:stable
image: package-ci/win10:v4
flavor: b1.large
editorpath: .Editor\Unity.exe
utr: .\utr.bat
- name: mac
type: Unity::VM::osx
image: package-ci/mac:stable
image: package-ci/macos-12:v4
flavor: b1.large
editorpath: .Editor/Unity.app/Contents/MacOS/Unity
utr: ./utr
- name: ubuntu
type: Unity::VM
image: package-ci/ubuntu:stable
image: package-ci/ubuntu-18.04:v4
flavor: b1.large
editorpath: .Editor/Unity
utr: ./utr
Expand All @@ -33,4 +30,4 @@ projects:
- name: com.unity.multiplayer.samples.coop
path: Packages/com.unity.multiplayer.samples.coop
test_editors:
- 2021.3
- 2022.3
3 changes: 3 additions & 0 deletions Assets/DefaultNetworkPrefabs.asset
View file
Open in desktop
Git LFS file not shown
8 changes: 8 additions & 0 deletions Assets/DefaultNetworkPrefabs.asset.meta
View file
Open in desktop

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

8 changes: 6 additions & 2 deletions Assets/Material/Characters/Character_Shadow.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,21 @@ Material:
m_PrefabAsset: {fileID: 0}
m_Name: Character_Shadow
m_Shader: {fileID: -6465566751694194690, guid: a9ba79dc821093a4c9041bcede85096b, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- _SURFACE_TYPE_TRANSPARENT
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
m_CustomRenderQueue: 3000
stringTagMap:
RenderType: Transparent
disabledShaderPasses:
- SHADOWCASTER
- DepthOnly
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
Expand Down Expand Up @@ -87,6 +90,7 @@ Material:
m_Ints: []
m_Floats:
- _AlphaClip: 0
- _AlphaToMask: 0
- _Blend: 0
- _BlendOp: 0
- _BumpScale: 1
Expand Down Expand Up @@ -140,4 +144,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 5
version: 7
8 changes: 6 additions & 2 deletions Assets/Material/Characters/Enemy_Eyes_sheet.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,21 @@ Material:
m_PrefabAsset: {fileID: 0}
m_Name: Enemy_Eyes_sheet
m_Shader: {fileID: -6465566751694194690, guid: a9ba79dc821093a4c9041bcede85096b, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- _SURFACE_TYPE_TRANSPARENT
m_InvalidKeywords: []
m_LightmapFlags: 2
m_EnableInstancingVariants: 1
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
m_CustomRenderQueue: 3000
stringTagMap:
RenderType: Transparent
disabledShaderPasses:
- SHADOWCASTER
- DepthOnly
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
Expand Down Expand Up @@ -83,6 +86,7 @@ Material:
m_Ints: []
m_Floats:
- _AlphaClip: 0
- _AlphaToMask: 0
- _Blend: 0
- _BumpScale: 1
- _CastShadows: 0
Expand Down Expand Up @@ -135,4 +139,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 5
version: 7
8 changes: 6 additions & 2 deletions Assets/Material/Characters/Enemy_Mouth_sheet.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 5
version: 7
--- !u!21 &2100000
Material:
serializedVersion: 8
Expand All @@ -22,18 +22,21 @@ Material:
m_PrefabAsset: {fileID: 0}
m_Name: Enemy_Mouth_sheet
m_Shader: {fileID: -6465566751694194690, guid: a9ba79dc821093a4c9041bcede85096b, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- _SURFACE_TYPE_TRANSPARENT
m_InvalidKeywords: []
m_LightmapFlags: 2
m_EnableInstancingVariants: 1
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
m_CustomRenderQueue: 3000
stringTagMap:
RenderType: Transparent
disabledShaderPasses:
- SHADOWCASTER
- DepthOnly
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
Expand Down Expand Up @@ -96,6 +99,7 @@ Material:
m_Ints: []
m_Floats:
- _AlphaClip: 0
- _AlphaToMask: 0
- _Blend: 0
- _BumpScale: 1
- _CastShadows: 0
Expand Down
8 changes: 6 additions & 2 deletions Assets/Material/Characters/Hero_Eyes_sheet.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,21 @@ Material:
m_PrefabAsset: {fileID: 0}
m_Name: Hero_Eyes_sheet
m_Shader: {fileID: -6465566751694194690, guid: a9ba79dc821093a4c9041bcede85096b, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- _SURFACE_TYPE_TRANSPARENT
m_InvalidKeywords: []
m_LightmapFlags: 2
m_EnableInstancingVariants: 1
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
m_CustomRenderQueue: 3000
stringTagMap:
RenderType: Transparent
disabledShaderPasses:
- SHADOWCASTER
- DepthOnly
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
Expand Down Expand Up @@ -83,6 +86,7 @@ Material:
m_Ints: []
m_Floats:
- _AlphaClip: 0
- _AlphaToMask: 0
- _Blend: 0
- _BumpScale: 1
- _CastShadows: 0
Expand Down Expand Up @@ -135,4 +139,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 5
version: 7
8 changes: 6 additions & 2 deletions Assets/Material/Characters/Hero_Mouth_sheet.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,21 @@ Material:
m_PrefabAsset: {fileID: 0}
m_Name: Hero_Mouth_sheet
m_Shader: {fileID: -6465566751694194690, guid: a9ba79dc821093a4c9041bcede85096b, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- _SURFACE_TYPE_TRANSPARENT
m_InvalidKeywords: []
m_LightmapFlags: 2
m_EnableInstancingVariants: 1
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
m_CustomRenderQueue: 3000
stringTagMap:
RenderType: Transparent
disabledShaderPasses:
- SHADOWCASTER
- DepthOnly
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
Expand Down Expand Up @@ -83,6 +86,7 @@ Material:
m_Ints: []
m_Floats:
- _AlphaClip: 0
- _AlphaToMask: 0
- _Blend: 0
- _BumpScale: 1
- _CastShadows: 0
Expand Down Expand Up @@ -140,4 +144,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 5
version: 7
5 changes: 4 additions & 1 deletion Assets/Material/Characters/Toon/Hair_Archer_Boy.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ Material:
m_PrefabAsset: {fileID: 0}
m_Name: Hair_Archer_Boy
m_Shader: {fileID: -6465566751694194690, guid: 317f1cf71d2fc30458456d44f39763d2, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords:
- _EMISSION
Expand All @@ -19,6 +21,7 @@ Material:
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
Expand Down Expand Up @@ -111,4 +114,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 5
version: 7
5 changes: 4 additions & 1 deletion Assets/Material/Characters/Toon/Hair_Archer_Girl.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ Material:
m_PrefabAsset: {fileID: 0}
m_Name: Hair_Archer_Girl
m_Shader: {fileID: -6465566751694194690, guid: 317f1cf71d2fc30458456d44f39763d2, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords:
- _EMISSION
Expand All @@ -19,6 +21,7 @@ Material:
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
Expand Down Expand Up @@ -111,4 +114,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 5
version: 7
5 changes: 4 additions & 1 deletion Assets/Material/Characters/Toon/Hair_Mage_Boy.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 5
version: 7
--- !u!21 &2100000
Material:
serializedVersion: 8
Expand All @@ -22,6 +22,8 @@ Material:
m_PrefabAsset: {fileID: 0}
m_Name: Hair_Mage_Boy
m_Shader: {fileID: -6465566751694194690, guid: 317f1cf71d2fc30458456d44f39763d2, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords:
- _EMISSION
Expand All @@ -32,6 +34,7 @@ Material:
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
Expand Down
5 changes: 4 additions & 1 deletion Assets/Material/Characters/Toon/Hair_Mage_Girl.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ Material:
m_PrefabAsset: {fileID: 0}
m_Name: Hair_Mage_Girl
m_Shader: {fileID: -6465566751694194690, guid: 317f1cf71d2fc30458456d44f39763d2, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords:
- _EMISSION
Expand All @@ -32,6 +34,7 @@ Material:
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
Expand Down Expand Up @@ -124,4 +127,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 5
version: 7
5 changes: 4 additions & 1 deletion Assets/Material/Characters/Toon/Hair_Rogue_Boy.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 5
version: 7
--- !u!21 &2100000
Material:
serializedVersion: 8
Expand All @@ -22,6 +22,8 @@ Material:
m_PrefabAsset: {fileID: 0}
m_Name: Hair_Rogue_Boy
m_Shader: {fileID: -6465566751694194690, guid: 317f1cf71d2fc30458456d44f39763d2, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords:
- _EMISSION
Expand All @@ -32,6 +34,7 @@ Material:
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
Expand Down
Loading