Skip to content

Commit f675409

Browse files
fernando-cortezfernando-cortez
authored
Merge pull request #130 from Unity-Technologies/develop
release: v1.3.0
2 parents 6e39bc2 + ee3cfdc commit f675409

161 files changed

Lines changed: 2756 additions & 843 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ upm-ci.log
1313
!/[Aa]ssets/**/*.meta
1414

1515
# User's project-specific settings implemented using Settings Manager
16-
/ProjectSettings/Packages
16+
**/ProjectSettings/Packages
1717

1818
# The rest are general best practices for Unity projects
1919
**/.Editor/
@@ -27,7 +27,7 @@ upm-ci.log
2727
**/[Vv]alidationSuiteResults/
2828

2929
# Project/user-specific settings using Settings Manager
30-
/ProjectSettings/Packages/
30+
**/ProjectSettings/Packages/
3131
# UserSettings introduced in 2020.1
3232
**/UserSettings/
3333

@@ -89,3 +89,5 @@ crashlytics-build.properties
8989

9090
# Mac file setting
9191
.DS_Store
92+
93+
**/*_clone_*/

‎.yamato/project.metafile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Therefore, **do not** put an older V1-lifecycle ver.
55
# like 2020.x or 2019.x on top of 'test_editors'
66
test_editors:
7-
- 2021.3
7+
- 2022.3
88

99
# Platforms that will be tested. The first entry in this array will also
1010
# be used for validation

‎Basic/2DSpaceShooter/.gitignore‎

Lines changed: 0 additions & 91 deletions
This file was deleted.

‎Basic/2DSpaceShooter/Assets/Materials/asteroids.mat‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ Material:
1010
m_Name: asteroids
1111
m_Shader: {fileID: -6465566751694194690, guid: 95c504d90ae813849bd0dc5cde1b0f2f,
1212
type: 3}
13+
m_Parent: {fileID: 0}
14+
m_ModifiedSerializedProperties: 0
1315
m_ValidKeywords:
1416
- _SURFACE_TYPE_TRANSPARENT
1517
m_InvalidKeywords: []
@@ -22,6 +24,7 @@ Material:
2224
disabledShaderPasses:
2325
- DepthOnly
2426
- SHADOWCASTER
27+
m_LockedProperties:
2528
m_SavedProperties:
2629
serializedVersion: 3
2730
m_TexEnvs:
@@ -49,6 +52,7 @@ Material:
4952
m_Floats:
5053
- _Alpha: 1
5154
- _AlphaClip: 0
55+
- _AlphaToMask: 0
5256
- _Blend: 0
5357
- _CastShadows: 0
5458
- _Cull: 2
@@ -80,4 +84,4 @@ MonoBehaviour:
8084
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
8185
m_Name:
8286
m_EditorClassIdentifier:
83-
version: 5
87+
version: 7

‎Basic/2DSpaceShooter/Assets/Materials/blockGlow.mat‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ MonoBehaviour:
1212
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
1313
m_Name:
1414
m_EditorClassIdentifier:
15-
version: 5
15+
version: 7
1616
--- !u!21 &2100000
1717
Material:
1818
serializedVersion: 8
@@ -23,6 +23,8 @@ Material:
2323
m_Name: blockGlow
2424
m_Shader: {fileID: -6465566751694194690, guid: 95c504d90ae813849bd0dc5cde1b0f2f,
2525
type: 3}
26+
m_Parent: {fileID: 0}
27+
m_ModifiedSerializedProperties: 0
2628
m_ValidKeywords:
2729
- _SURFACE_TYPE_TRANSPARENT
2830
m_InvalidKeywords: []
@@ -35,6 +37,7 @@ Material:
3537
disabledShaderPasses:
3638
- DepthOnly
3739
- SHADOWCASTER
40+
m_LockedProperties:
3841
m_SavedProperties:
3942
serializedVersion: 3
4043
m_TexEnvs:
@@ -95,6 +98,7 @@ Material:
9598
- PixelSnap: 0
9699
- _Alpha: 0.3
97100
- _AlphaClip: 0
101+
- _AlphaToMask: 0
98102
- _Blend: 0
99103
- _BlendOp: 0
100104
- _BumpScale: 1

‎Basic/2DSpaceShooter/Assets/Materials/blockGlow02.mat‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ MonoBehaviour:
1212
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
1313
m_Name:
1414
m_EditorClassIdentifier:
15-
version: 5
15+
version: 7
1616
--- !u!21 &2100000
1717
Material:
1818
serializedVersion: 8
@@ -23,6 +23,8 @@ Material:
2323
m_Name: blockGlow02
2424
m_Shader: {fileID: -6465566751694194690, guid: 95c504d90ae813849bd0dc5cde1b0f2f,
2525
type: 3}
26+
m_Parent: {fileID: 0}
27+
m_ModifiedSerializedProperties: 0
2628
m_ValidKeywords:
2729
- _SURFACE_TYPE_TRANSPARENT
2830
m_InvalidKeywords: []
@@ -35,6 +37,7 @@ Material:
3537
disabledShaderPasses:
3638
- DepthOnly
3739
- SHADOWCASTER
40+
m_LockedProperties:
3841
m_SavedProperties:
3942
serializedVersion: 3
4043
m_TexEnvs:
@@ -95,6 +98,7 @@ Material:
9598
- PixelSnap: 0
9699
- _Alpha: 0.3
97100
- _AlphaClip: 0
101+
- _AlphaToMask: 0
98102
- _Blend: 0
99103
- _BlendOp: 0
100104
- _BumpScale: 1

‎Basic/2DSpaceShooter/Assets/Materials/blocks.mat‎

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,28 @@
22
%TAG !u! tag:unity3d.com,2011:
33
--- !u!21 &2100000
44
Material:
5-
serializedVersion: 6
5+
serializedVersion: 8
66
m_ObjectHideFlags: 0
77
m_CorrespondingSourceObject: {fileID: 0}
88
m_PrefabInstance: {fileID: 0}
99
m_PrefabAsset: {fileID: 0}
1010
m_Name: blocks
1111
m_Shader: {fileID: -6465566751694194690, guid: 79336e0b0e19a5c46be170f3cb26de75,
1212
type: 3}
13-
m_ShaderKeywords: _ALPHABLEND_ON _GLOSSYREFLECTIONS_OFF _SPECULARHIGHLIGHTS_OFF
13+
m_Parent: {fileID: 0}
14+
m_ModifiedSerializedProperties: 0
15+
m_ValidKeywords: []
16+
m_InvalidKeywords:
17+
- _ALPHABLEND_ON
18+
- _GLOSSYREFLECTIONS_OFF
19+
- _SPECULARHIGHLIGHTS_OFF
1420
m_LightmapFlags: 0
1521
m_EnableInstancingVariants: 0
1622
m_DoubleSidedGI: 0
1723
m_CustomRenderQueue: -1
1824
stringTagMap: {}
1925
disabledShaderPasses: []
26+
m_LockedProperties:
2027
m_SavedProperties:
2128
serializedVersion: 3
2229
m_TexEnvs:
@@ -72,6 +79,7 @@ Material:
7279
m_Texture: {fileID: 0}
7380
m_Scale: {x: 1, y: 1}
7481
m_Offset: {x: 0, y: 0}
82+
m_Ints: []
7583
m_Floats:
7684
- PixelSnap: 0
7785
- _Alpha: 1
@@ -120,3 +128,16 @@ Material:
120128
- _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0}
121129
- _TilingOffset: {r: 1, g: 1, b: 0, a: 0}
122130
m_BuildTextureStacks: []
131+
--- !u!114 &6249219236255181419
132+
MonoBehaviour:
133+
m_ObjectHideFlags: 11
134+
m_CorrespondingSourceObject: {fileID: 0}
135+
m_PrefabInstance: {fileID: 0}
136+
m_PrefabAsset: {fileID: 0}
137+
m_GameObject: {fileID: 0}
138+
m_Enabled: 1
139+
m_EditorHideFlags: 0
140+
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
141+
m_Name:
142+
m_EditorClassIdentifier:
143+
version: 7

‎Basic/2DSpaceShooter/Assets/Materials/bounds.mat‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ Material:
1010
m_Name: bounds
1111
m_Shader: {fileID: -6465566751694194690, guid: 95c504d90ae813849bd0dc5cde1b0f2f,
1212
type: 3}
13+
m_Parent: {fileID: 0}
14+
m_ModifiedSerializedProperties: 0
1315
m_ValidKeywords:
1416
- _SURFACE_TYPE_TRANSPARENT
1517
m_InvalidKeywords: []
@@ -22,6 +24,7 @@ Material:
2224
disabledShaderPasses:
2325
- DepthOnly
2426
- SHADOWCASTER
27+
m_LockedProperties:
2528
m_SavedProperties:
2629
serializedVersion: 3
2730
m_TexEnvs:
@@ -49,6 +52,7 @@ Material:
4952
m_Floats:
5053
- _Alpha: 0.67
5154
- _AlphaClip: 0
55+
- _AlphaToMask: 0
5256
- _Blend: 2
5357
- _CastShadows: 0
5458
- _Cull: 2
@@ -79,4 +83,4 @@ MonoBehaviour:
7983
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
8084
m_Name:
8185
m_EditorClassIdentifier:
82-
version: 5
86+
version: 7

‎Basic/2DSpaceShooter/Assets/Materials/bounds02.mat‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ Material:
1010
m_Name: bounds02
1111
m_Shader: {fileID: -6465566751694194690, guid: 95c504d90ae813849bd0dc5cde1b0f2f,
1212
type: 3}
13+
m_Parent: {fileID: 0}
14+
m_ModifiedSerializedProperties: 0
1315
m_ValidKeywords:
1416
- _SURFACE_TYPE_TRANSPARENT
1517
m_InvalidKeywords: []
@@ -22,6 +24,7 @@ Material:
2224
disabledShaderPasses:
2325
- DepthOnly
2426
- SHADOWCASTER
27+
m_LockedProperties:
2528
m_SavedProperties:
2629
serializedVersion: 3
2730
m_TexEnvs:
@@ -49,6 +52,7 @@ Material:
4952
m_Floats:
5053
- _Alpha: 0.67
5154
- _AlphaClip: 0
55+
- _AlphaToMask: 0
5256
- _Blend: 2
5357
- _CastShadows: 0
5458
- _Cull: 2
@@ -80,4 +84,4 @@ MonoBehaviour:
8084
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
8185
m_Name:
8286
m_EditorClassIdentifier:
83-
version: 5
87+
version: 7

‎Basic/2DSpaceShooter/Assets/Materials/bullet.mat‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ Material:
1010
m_Name: bullet
1111
m_Shader: {fileID: -6465566751694194690, guid: 95c504d90ae813849bd0dc5cde1b0f2f,
1212
type: 3}
13+
m_Parent: {fileID: 0}
14+
m_ModifiedSerializedProperties: 0
1315
m_ValidKeywords:
1416
- _SURFACE_TYPE_TRANSPARENT
1517
m_InvalidKeywords: []
@@ -22,6 +24,7 @@ Material:
2224
disabledShaderPasses:
2325
- SHADOWCASTER
2426
- DepthOnly
27+
m_LockedProperties:
2528
m_SavedProperties:
2629
serializedVersion: 3
2730
m_TexEnvs:
@@ -49,6 +52,7 @@ Material:
4952
m_Floats:
5053
- _Alpha: 1
5154
- _AlphaClip: 0
55+
- _AlphaToMask: 0
5256
- _Blend: 2
5357
- _CastShadows: 0
5458
- _Cull: 2
@@ -79,4 +83,4 @@ MonoBehaviour:
7983
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
8084
m_Name:
8185
m_EditorClassIdentifier:
82-
version: 5
86+
version: 7

0 commit comments

Comments
 (0)