Skip to content

chore: bump boss room to 2021 [MTT-3022] #620

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

Merged
merged 29 commits into from
May 4, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
e9a2f6c
initial engine bump
SamuelBellomo Apr 14, 2022
611a998
fix
SamuelBellomo Apr 14, 2022
d1d4ba9
adding missing network object on main menu state prefab
SamuelBellomo Apr 14, 2022
38b166c
reserialize scenes
SamuelBellomo Apr 14, 2022
88dc66d
missing changes
SamuelBellomo Apr 14, 2022
ca264e4
auto generated changes
SamuelBellomo Apr 14, 2022
de619af
initial pass at hooks
SamuelBellomo Apr 14, 2022
0aa9a40
Adding project id detection
SamuelBellomo Apr 14, 2022
65ec34f
something didn't work, reverting file
SamuelBellomo Apr 14, 2022
2ae194a
adding git lfs support
SamuelBellomo Apr 14, 2022
709ebcc
cleanup
SamuelBellomo Apr 14, 2022
3d6ac4e
Merge branch 'sam/feat/pre-commit-hook' into feature/bump-2021
SamuelBellomo Apr 14, 2022
644c8ae
MTT-3022
SamuelBellomo Apr 14, 2022
187a4a6
Merge branch 'develop' into feature/bump-2021
SamuelBellomo Apr 20, 2022
694b0d8
bumping to latest LTS
SamuelBellomo Apr 20, 2022
7d3bd91
Anything under ProjectSettings should be versioned.
SamuelBellomo Apr 20, 2022
f83cda3
Now tracking new settings
SamuelBellomo Apr 21, 2022
8d405ac
dunno why this was updated automatically, this isn't findable... reve…
SamuelBellomo Apr 21, 2022
178e961
setting package-lock as non LFS
SamuelBellomo Apr 21, 2022
fd2778c
revert adding VP and RNSM to package-lock
SamuelBellomo Apr 21, 2022
26d7e37
removing file that should be in user settings according to this bug h…
SamuelBellomo Apr 21, 2022
618d577
tmp commit for merge
SamuelBellomo Apr 28, 2022
b02186b
generated files as well
SamuelBellomo Apr 28, 2022
23ba989
Merge branch 'develop' into feature/bump-2021
SamuelBellomo Apr 28, 2022
82d005d
update with right package lock
SamuelBellomo Apr 28, 2022
d49af7d
material update
SamuelBellomo Apr 28, 2022
637ff27
tmp-do-not-push
SamuelBellomo May 3, 2022
959013f
Merge branch 'develop' into feature/bump-2021
SamuelBellomo May 3, 2022
1ced2a7
auto version bump in package-lock
SamuelBellomo May 3, 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
13 changes: 9 additions & 4 deletions Assets/BossRoom/Material/Characters/Character_Shadow.mat
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,16 @@
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Character_Shadow
m_Shader: {fileID: 4800000, guid: 650dd9526735d5b46b79224bc6e94025, type: 3}
m_ShaderKeywords:
m_ValidKeywords:
- _SURFACE_TYPE_TRANSPARENT
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
Expand All @@ -18,6 +20,7 @@ Material:
RenderType: Transparent
disabledShaderPasses:
- SHADOWCASTER
- DepthOnly
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
Expand Down Expand Up @@ -77,9 +80,11 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _AlphaClip: 0
- _Blend: 0
- _BlendOp: 0
- _BumpScale: 1
- _ClearCoatMask: 0
- _ClearCoatSmoothness: 0
Expand Down Expand Up @@ -107,7 +112,7 @@ Material:
- _ZWrite: 0
m_Colors:
- _BaseColor: {r: 0, g: 0, b: 0, a: 0.54509807}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _Color: {r: 0, g: 0, b: 0, a: 0.54509807}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: []
Expand All @@ -123,4 +128,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 4
version: 5
15 changes: 11 additions & 4 deletions Assets/BossRoom/Material/Characters/Enemy_Eyes_sheet.mat
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,19 @@
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Enemy_Eyes_sheet
m_Shader: {fileID: 4800000, guid: 8d2bb70cbf9db8d4da26e15b26e74248, type: 3}
m_ShaderKeywords: _ALPHATEST_ON _EMISSION _RECEIVE_SHADOWS_OFF
m_ValidKeywords:
- _ALPHATEST_ON
- _EMISSION
- _RECEIVE_SHADOWS_OFF
- _SURFACE_TYPE_TRANSPARENT
m_InvalidKeywords: []
m_LightmapFlags: 2
m_EnableInstancingVariants: 1
m_DoubleSidedGI: 0
Expand All @@ -18,6 +23,7 @@ Material:
RenderType: Transparent
disabledShaderPasses:
- SHADOWCASTER
- DepthOnly
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
Expand Down Expand Up @@ -77,6 +83,7 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _AlphaClip: 1
- _Blend: 0
Expand Down Expand Up @@ -107,7 +114,7 @@ Material:
- _ZWrite: 0
m_Colors:
- _BaseColor: {r: 0.5019608, g: 0.5019608, b: 0.5019608, a: 1}
- _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1}
- _Color: {r: 0.5019608, g: 0.5019608, b: 0.5019608, a: 1}
- _EmissionColor: {r: 0.27450982, g: 0.27450982, b: 0.27450982, a: 1}
- _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}
m_BuildTextureStacks: []
Expand All @@ -123,4 +130,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 4
version: 5
15 changes: 11 additions & 4 deletions Assets/BossRoom/Material/Characters/Enemy_Mouth_sheet.mat
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,22 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 4
version: 5
--- !u!21 &2100000
Material:
serializedVersion: 6
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Enemy_Mouth_sheet
m_Shader: {fileID: 4800000, guid: 8d2bb70cbf9db8d4da26e15b26e74248, type: 3}
m_ShaderKeywords: _ALPHATEST_ON _EMISSION _RECEIVE_SHADOWS_OFF
m_ValidKeywords:
- _ALPHATEST_ON
- _EMISSION
- _RECEIVE_SHADOWS_OFF
- _SURFACE_TYPE_TRANSPARENT
m_InvalidKeywords: []
m_LightmapFlags: 2
m_EnableInstancingVariants: 1
m_DoubleSidedGI: 0
Expand All @@ -31,6 +36,7 @@ Material:
RenderType: Transparent
disabledShaderPasses:
- SHADOWCASTER
- DepthOnly
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
Expand Down Expand Up @@ -90,6 +96,7 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _AlphaClip: 1
- _Blend: 0
Expand Down Expand Up @@ -123,7 +130,7 @@ Material:
m_Colors:
- _AmbientColor: {r: 0.4, g: 0.4, b: 0.4, a: 1}
- _BaseColor: {r: 0.5019608, g: 0.5019608, b: 0.5019608, a: 1}
- _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1}
- _Color: {r: 0.5019608, g: 0.5019608, b: 0.5019608, a: 1}
- _EmissionColor: {r: 0.2745098, g: 0.2745098, b: 0.2745098, a: 1}
- _RimColor: {r: 1, g: 1, b: 1, a: 1}
- _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}
Expand Down
15 changes: 11 additions & 4 deletions Assets/BossRoom/Material/Characters/Hero_Eyes_sheet.mat
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,19 @@
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Hero_Eyes_sheet
m_Shader: {fileID: 4800000, guid: 8d2bb70cbf9db8d4da26e15b26e74248, type: 3}
m_ShaderKeywords: _ALPHATEST_ON _EMISSION _RECEIVE_SHADOWS_OFF
m_ValidKeywords:
- _ALPHATEST_ON
- _EMISSION
- _RECEIVE_SHADOWS_OFF
- _SURFACE_TYPE_TRANSPARENT
m_InvalidKeywords: []
m_LightmapFlags: 2
m_EnableInstancingVariants: 1
m_DoubleSidedGI: 0
Expand All @@ -18,6 +23,7 @@ Material:
RenderType: Transparent
disabledShaderPasses:
- SHADOWCASTER
- DepthOnly
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
Expand Down Expand Up @@ -77,6 +83,7 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _AlphaClip: 1
- _Blend: 0
Expand Down Expand Up @@ -107,7 +114,7 @@ Material:
- _ZWrite: 0
m_Colors:
- _BaseColor: {r: 0.248, g: 0.248, b: 0.248, a: 1}
- _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1}
- _Color: {r: 0.24799997, g: 0.24799997, b: 0.24799997, a: 1}
- _EmissionColor: {r: 0.135, g: 0.135, b: 0.135, a: 1}
- _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}
m_BuildTextureStacks: []
Expand All @@ -123,4 +130,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 4
version: 5
15 changes: 11 additions & 4 deletions Assets/BossRoom/Material/Characters/Hero_Mouth_sheet.mat
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,19 @@
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Hero_Mouth_sheet
m_Shader: {fileID: 4800000, guid: 8d2bb70cbf9db8d4da26e15b26e74248, type: 3}
m_ShaderKeywords: _ALPHATEST_ON _EMISSION _RECEIVE_SHADOWS_OFF
m_ValidKeywords:
- _ALPHATEST_ON
- _EMISSION
- _RECEIVE_SHADOWS_OFF
- _SURFACE_TYPE_TRANSPARENT
m_InvalidKeywords: []
m_LightmapFlags: 2
m_EnableInstancingVariants: 1
m_DoubleSidedGI: 0
Expand All @@ -18,6 +23,7 @@ Material:
RenderType: Transparent
disabledShaderPasses:
- SHADOWCASTER
- DepthOnly
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
Expand Down Expand Up @@ -77,6 +83,7 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _AlphaClip: 1
- _Blend: 0
Expand Down Expand Up @@ -110,7 +117,7 @@ Material:
m_Colors:
- _AmbientColor: {r: 0.4, g: 0.4, b: 0.4, a: 1}
- _BaseColor: {r: 0.5019608, g: 0.5019608, b: 0.5019608, a: 1}
- _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1}
- _Color: {r: 0.5019608, g: 0.5019608, b: 0.5019608, a: 1}
- _EmissionColor: {r: 0.2745098, g: 0.2745098, b: 0.2745098, a: 1}
- _RimColor: {r: 1, g: 1, b: 1, a: 1}
- _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}
Expand All @@ -128,4 +135,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 4
version: 5
21 changes: 19 additions & 2 deletions Assets/BossRoom/Material/Characters/Toon/Hair_Archer_Boy.mat
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,17 @@
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Hair_Archer_Boy
m_Shader: {fileID: -6465566751694194690, guid: 317f1cf71d2fc30458456d44f39763d2, type: 3}
m_ShaderKeywords: _EMISSION _NORMALMAP
m_ValidKeywords: []
m_InvalidKeywords:
- _EMISSION
- _NORMALMAP
m_LightmapFlags: 2
m_EnableInstancingVariants: 1
m_DoubleSidedGI: 0
Expand Down Expand Up @@ -67,6 +70,7 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _BumpScale: 1
- _Cutoff: 0.5
Expand All @@ -93,3 +97,16 @@ Material:
- _RimColor: {r: 1, g: 1, b: 1, a: 1}
- _SpecularColor: {r: 3.6078432, g: 3.6078432, b: 3.6078432, a: 1}
m_BuildTextureStacks: []
--- !u!114 &4864082934053653154
MonoBehaviour:
m_ObjectHideFlags: 11
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: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 5
21 changes: 19 additions & 2 deletions Assets/BossRoom/Material/Characters/Toon/Hair_Archer_Girl.mat
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,17 @@
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Hair_Archer_Girl
m_Shader: {fileID: -6465566751694194690, guid: 317f1cf71d2fc30458456d44f39763d2, type: 3}
m_ShaderKeywords: _EMISSION _NORMALMAP
m_ValidKeywords: []
m_InvalidKeywords:
- _EMISSION
- _NORMALMAP
m_LightmapFlags: 2
m_EnableInstancingVariants: 1
m_DoubleSidedGI: 0
Expand Down Expand Up @@ -67,6 +70,7 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _BumpScale: 1
- _Cutoff: 0.5
Expand All @@ -93,3 +97,16 @@ Material:
- _RimColor: {r: 4, g: 4, b: 4, a: 1}
- _SpecularColor: {r: 7.2156863, g: 7.2156863, b: 7.2156863, a: 1}
m_BuildTextureStacks: []
--- !u!114 &6413572590179603764
MonoBehaviour:
m_ObjectHideFlags: 11
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: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 5
21 changes: 19 additions & 2 deletions Assets/BossRoom/Material/Characters/Toon/Hair_Imp_Bomb.mat
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,17 @@
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Hair_Imp_Bomb
m_Shader: {fileID: -6465566751694194690, guid: 317f1cf71d2fc30458456d44f39763d2, type: 3}
m_ShaderKeywords: _EMISSION _NORMALMAP
m_ValidKeywords: []
m_InvalidKeywords:
- _EMISSION
- _NORMALMAP
m_LightmapFlags: 2
m_EnableInstancingVariants: 1
m_DoubleSidedGI: 0
Expand Down Expand Up @@ -67,6 +70,7 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _BumpScale: 1
- _Cutoff: 0.5
Expand All @@ -93,3 +97,16 @@ Material:
- _RimColor: {r: 4, g: 4, b: 4, a: 1}
- _SpecularColor: {r: 7.2156863, g: 7.2156863, b: 7.2156863, a: 1}
m_BuildTextureStacks: []
--- !u!114 &6547934805506010362
MonoBehaviour:
m_ObjectHideFlags: 11
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: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 5
Loading