Skip to content

Commit

Permalink
Rename physics materials
Browse files Browse the repository at this point in the history
  • Loading branch information
adamgraham committed May 29, 2021
1 parent 05f5d67 commit b2704f7
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 22 deletions.
11 changes: 11 additions & 0 deletions Materials/2D/Bouncy.physicsMaterial2D
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!62 &6200000
PhysicsMaterial2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Bouncy
friction: 0.3
bounciness: 1
File renamed without changes.
10 changes: 0 additions & 10 deletions Materials/2D/BouncyBox.physicsMaterial2D

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,12 @@
--- !u!134 &13400000
PhysicMaterial:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: ZeroFriction
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Slippery
dynamicFriction: 0
staticFriction: 0
bounciness: 0
frictionCombine: 2
bounceCombine: 0
frictionDirection2: {x: 0, y: 0, z: 0}
dynamicFriction2: 0
staticFriction2: 0
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,12 @@
--- !u!134 &13400000
PhysicMaterial:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: MaxFriction
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Sticky
dynamicFriction: 1
staticFriction: 1
bounciness: 0
frictionCombine: 3
bounceCombine: 0
frictionDirection2: {x: 0, y: 0, z: 0}
dynamicFriction2: 0
staticFriction2: 0
File renamed without changes.

0 comments on commit b2704f7

Please sign in to comment.