Skip to content

Add sounds to playfield item prefabs (rebased) #23

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 9 commits into from
Jan 30, 2025
Merged

Add sounds to playfield item prefabs (rebased) #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e606764
gate: Use meshes from FBX file and fix scaling.
freezy Dec 13, 2023
b15f6f4
Update more materials.
freezy Dec 14, 2023
e488c86
Move spinners, targets, bumper and gate to asset lib.
freezy Dec 5, 2024
8c8644f
prefabs: Update Gate relations.
freezy Dec 7, 2024
7edbbf8
prefabs: Move bumper, targets and kickers to the asset library.
freezy Dec 8, 2024
ace1511
patch: Temp re-add bumper and gate so we can patch it.
freezy Jan 13, 2025
093d2ba
Add sounds to bumper and gate prefabs
arthurkehrwald Jan 8, 2025
e0a3ec1
Migrate prefabs that make sound from main repo
arthurkehrwald Jan 8, 2025
000612c
patch: Remove gate and bumper.
freezy Jan 13, 2025
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
10 changes: 5 additions & 5 deletions Assets/Art/Materials/Measured/Aluminum/AluminumBrushed.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@ Material:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: AluminumBrushed
m_Shader: {fileID: -6465566751694194690, guid: f6e84ea80ee1ffe4cb326c6463fc5719,
type: 3}
m_Shader: {fileID: -6465566751694194690, guid: f6e84ea80ee1ffe4cb326c6463fc5719, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
Expand Down Expand Up @@ -206,6 +205,7 @@ Material:
- _EnableGeometricSpecularAA: 0
- _EnableSpecularOcclusion: 0
- _EnergyConservingSpecularColor: 1
- _ExcludeFromTUAndAA: 0
- _HdrpVersion: 2
- _HeightAmplitude: 0.02
- _HeightCenter: 0.5
Expand Down Expand Up @@ -250,10 +250,10 @@ Material:
- _StencilRefGBuffer: 10
- _StencilRefMV: 40
- _StencilWriteMask: 6
- _StencilWriteMaskDepth: 8
- _StencilWriteMaskDepth: 9
- _StencilWriteMaskDistortionVec: 4
- _StencilWriteMaskGBuffer: 14
- _StencilWriteMaskMV: 40
- _StencilWriteMaskGBuffer: 15
- _StencilWriteMaskMV: 41
- _SubsurfaceMask: 1
- _SupportDecals: 1
- _SurfaceType: 0
Expand Down
8 changes: 4 additions & 4 deletions Assets/Art/Materials/Measured/Plastic/Plastic.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,7 @@ Material:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Plastic
m_Shader: {fileID: -6465566751694194690, guid: 9ce2b8401e2fe0a49b20d9a27f394128,
type: 3}
m_Shader: {fileID: -6465566751694194690, guid: 9ce2b8401e2fe0a49b20d9a27f394128, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
Expand Down Expand Up @@ -206,6 +205,7 @@ Material:
- _EnableGeometricSpecularAA: 0
- _EnableSpecularOcclusion: 0
- _EnergyConservingSpecularColor: 1
- _ExcludeFromTUAndAA: 0
- _HdrpVersion: 2
- _HeightAmplitude: 0.02
- _HeightCenter: 0.5
Expand Down Expand Up @@ -249,10 +249,10 @@ Material:
- _StencilRefGBuffer: 10
- _StencilRefMV: 40
- _StencilWriteMask: 6
- _StencilWriteMaskDepth: 8
- _StencilWriteMaskDepth: 9
- _StencilWriteMaskDistortionVec: 4
- _StencilWriteMaskGBuffer: 14
- _StencilWriteMaskMV: 40
- _StencilWriteMaskMV: 43
- _SubsurfaceMask: 1
- _SupportDecals: 1
- _SurfaceType: 0
Expand Down
8 changes: 4 additions & 4 deletions Assets/Art/Materials/Measured/Wood/QuiltedMaple/QuiltedMapleCoat_Bronze.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@ Material:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: QuiltedMapleCoat_Bronze
m_Shader: {fileID: -6465566751694194690, guid: b50461af522bbf34a881035bf7a4e1b6,
type: 3}
m_Shader: {fileID: -6465566751694194690, guid: b50461af522bbf34a881035bf7a4e1b6, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
Expand Down Expand Up @@ -209,6 +208,7 @@ Material:
- _EnableGeometricSpecularAA: 0
- _EnableSpecularOcclusion: 0
- _EnergyConservingSpecularColor: 1
- _ExcludeFromTUAndAA: 0
- _HdrpVersion: 2
- _HeightAmplitude: 0.02
- _HeightCenter: 0.5
Expand Down Expand Up @@ -252,10 +252,10 @@ Material:
- _StencilRefGBuffer: 10
- _StencilRefMV: 40
- _StencilWriteMask: 6
- _StencilWriteMaskDepth: 8
- _StencilWriteMaskDepth: 9
- _StencilWriteMaskDistortionVec: 4
- _StencilWriteMaskGBuffer: 14
- _StencilWriteMaskMV: 40
- _StencilWriteMaskMV: 43
- _SubsurfaceMask: 1
- _SupportDecals: 1
- _SurfaceType: 0
Expand Down
8 changes: 4 additions & 4 deletions Assets/Art/Materials/Measured/Wood/QuiltedMaple/QuiltedMapleCoat_Brown.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,7 @@ Material:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: QuiltedMapleCoat_Brown
m_Shader: {fileID: -6465566751694194690, guid: b50461af522bbf34a881035bf7a4e1b6,
type: 3}
m_Shader: {fileID: -6465566751694194690, guid: b50461af522bbf34a881035bf7a4e1b6, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
Expand Down Expand Up @@ -225,6 +224,7 @@ Material:
- _EnableGeometricSpecularAA: 0
- _EnableSpecularOcclusion: 0
- _EnergyConservingSpecularColor: 1
- _ExcludeFromTUAndAA: 0
- _HdrpVersion: 2
- _HeightAmplitude: 0.02
- _HeightCenter: 0.5
Expand Down Expand Up @@ -268,10 +268,10 @@ Material:
- _StencilRefGBuffer: 10
- _StencilRefMV: 40
- _StencilWriteMask: 6
- _StencilWriteMaskDepth: 8
- _StencilWriteMaskDepth: 9
- _StencilWriteMaskDistortionVec: 4
- _StencilWriteMaskGBuffer: 14
- _StencilWriteMaskMV: 40
- _StencilWriteMaskMV: 43
- _SubsurfaceMask: 1
- _SupportDecals: 1
- _SurfaceType: 0
Expand Down
8 changes: 4 additions & 4 deletions Assets/Art/Materials/Measured/Wood/QuiltedMaple/QuiltedMapleCoat_Natural.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@ Material:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: QuiltedMapleCoat_Natural
m_Shader: {fileID: -6465566751694194690, guid: b50461af522bbf34a881035bf7a4e1b6,
type: 3}
m_Shader: {fileID: -6465566751694194690, guid: b50461af522bbf34a881035bf7a4e1b6, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
Expand Down Expand Up @@ -209,6 +208,7 @@ Material:
- _EnableGeometricSpecularAA: 0
- _EnableSpecularOcclusion: 0
- _EnergyConservingSpecularColor: 1
- _ExcludeFromTUAndAA: 0
- _HdrpVersion: 2
- _HeightAmplitude: 0.02
- _HeightCenter: 0.5
Expand Down Expand Up @@ -252,10 +252,10 @@ Material:
- _StencilRefGBuffer: 10
- _StencilRefMV: 40
- _StencilWriteMask: 6
- _StencilWriteMaskDepth: 8
- _StencilWriteMaskDepth: 9
- _StencilWriteMaskDistortionVec: 4
- _StencilWriteMaskGBuffer: 14
- _StencilWriteMaskMV: 40
- _StencilWriteMaskMV: 43
- _SubsurfaceMask: 1
- _SupportDecals: 1
- _SurfaceType: 0
Expand Down
8 changes: 4 additions & 4 deletions Assets/Art/Materials/Measured/Wood/QuiltedMaple/QuiltedMapleCoat_Sienna.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@ Material:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: QuiltedMapleCoat_Sienna
m_Shader: {fileID: -6465566751694194690, guid: b50461af522bbf34a881035bf7a4e1b6,
type: 3}
m_Shader: {fileID: -6465566751694194690, guid: b50461af522bbf34a881035bf7a4e1b6, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
Expand Down Expand Up @@ -209,6 +208,7 @@ Material:
- _EnableGeometricSpecularAA: 0
- _EnableSpecularOcclusion: 0
- _EnergyConservingSpecularColor: 1
- _ExcludeFromTUAndAA: 0
- _HdrpVersion: 2
- _HeightAmplitude: 0.02
- _HeightCenter: 0.5
Expand Down Expand Up @@ -252,10 +252,10 @@ Material:
- _StencilRefGBuffer: 10
- _StencilRefMV: 40
- _StencilWriteMask: 6
- _StencilWriteMaskDepth: 8
- _StencilWriteMaskDepth: 9
- _StencilWriteMaskDistortionVec: 4
- _StencilWriteMaskGBuffer: 14
- _StencilWriteMaskMV: 40
- _StencilWriteMaskMV: 43
- _SubsurfaceMask: 1
- _SupportDecals: 1
- _SurfaceType: 0
Expand Down
10 changes: 5 additions & 5 deletions Assets/Art/Materials/Measured/Wood/QuiltedMaple/QuiltedMaple_Black.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@ Material:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: QuiltedMaple_Black
m_Shader: {fileID: -6465566751694194690, guid: aa64590f33bc57c42927749009beaf50,
type: 3}
m_Shader: {fileID: -6465566751694194690, guid: aa64590f33bc57c42927749009beaf50, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
Expand Down Expand Up @@ -207,6 +206,7 @@ Material:
- _EnableGeometricSpecularAA: 0
- _EnableSpecularOcclusion: 0
- _EnergyConservingSpecularColor: 1
- _ExcludeFromTUAndAA: 0
- _HdrpVersion: 2
- _HeightAmplitude: 0.02
- _HeightCenter: 0.5
Expand Down Expand Up @@ -251,10 +251,10 @@ Material:
- _StencilRefGBuffer: 10
- _StencilRefMV: 40
- _StencilWriteMask: 6
- _StencilWriteMaskDepth: 8
- _StencilWriteMaskDepth: 9
- _StencilWriteMaskDistortionVec: 4
- _StencilWriteMaskGBuffer: 14
- _StencilWriteMaskMV: 40
- _StencilWriteMaskGBuffer: 15
- _StencilWriteMaskMV: 41
- _SubsurfaceMask: 1
- _SupportDecals: 1
- _SurfaceType: 0
Expand Down
10 changes: 5 additions & 5 deletions Assets/Art/Materials/Measured/Wood/QuiltedMaple/QuiltedMaple_Bronze.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,7 @@ Material:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: QuiltedMaple_Bronze
m_Shader: {fileID: -6465566751694194690, guid: aa64590f33bc57c42927749009beaf50,
type: 3}
m_Shader: {fileID: -6465566751694194690, guid: aa64590f33bc57c42927749009beaf50, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
Expand Down Expand Up @@ -223,6 +222,7 @@ Material:
- _EnableGeometricSpecularAA: 0
- _EnableSpecularOcclusion: 0
- _EnergyConservingSpecularColor: 1
- _ExcludeFromTUAndAA: 0
- _HdrpVersion: 2
- _HeightAmplitude: 0.02
- _HeightCenter: 0.5
Expand Down Expand Up @@ -267,10 +267,10 @@ Material:
- _StencilRefGBuffer: 10
- _StencilRefMV: 40
- _StencilWriteMask: 6
- _StencilWriteMaskDepth: 8
- _StencilWriteMaskDepth: 9
- _StencilWriteMaskDistortionVec: 4
- _StencilWriteMaskGBuffer: 14
- _StencilWriteMaskMV: 40
- _StencilWriteMaskGBuffer: 15
- _StencilWriteMaskMV: 41
- _SubsurfaceMask: 1
- _SupportDecals: 1
- _SurfaceType: 0
Expand Down
10 changes: 5 additions & 5 deletions Assets/Art/Materials/Measured/Wood/QuiltedMaple/QuiltedMaple_Natural.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,7 @@ Material:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: QuiltedMaple_Natural
m_Shader: {fileID: -6465566751694194690, guid: aa64590f33bc57c42927749009beaf50,
type: 3}
m_Shader: {fileID: -6465566751694194690, guid: aa64590f33bc57c42927749009beaf50, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
Expand Down Expand Up @@ -223,6 +222,7 @@ Material:
- _EnableGeometricSpecularAA: 0
- _EnableSpecularOcclusion: 0
- _EnergyConservingSpecularColor: 1
- _ExcludeFromTUAndAA: 0
- _HdrpVersion: 2
- _HeightAmplitude: 0.02
- _HeightCenter: 0.5
Expand Down Expand Up @@ -267,10 +267,10 @@ Material:
- _StencilRefGBuffer: 10
- _StencilRefMV: 40
- _StencilWriteMask: 6
- _StencilWriteMaskDepth: 8
- _StencilWriteMaskDepth: 9
- _StencilWriteMaskDistortionVec: 4
- _StencilWriteMaskGBuffer: 14
- _StencilWriteMaskMV: 40
- _StencilWriteMaskGBuffer: 15
- _StencilWriteMaskMV: 41
- _SubsurfaceMask: 1
- _SupportDecals: 1
- _SurfaceType: 0
Expand Down
Loading