Compare commits
1 Commits
f931fa7979
...
06043b258e
| Author | SHA1 | Date | |
|---|---|---|---|
| 06043b258e |
55
.gitattributes
vendored
55
.gitattributes
vendored
@@ -1,55 +0,0 @@
|
|||||||
## Unity ##
|
|
||||||
|
|
||||||
*.cs diff=csharp text
|
|
||||||
*.cginc text
|
|
||||||
*.shader text
|
|
||||||
|
|
||||||
*.mat merge=unityyamlmerge eol=lf
|
|
||||||
*.anim merge=unityyamlmerge eol=lf
|
|
||||||
*.unity merge=unityyamlmerge eol=lf
|
|
||||||
*.prefab merge=unityyamlmerge eol=lf
|
|
||||||
*.physicsMaterial2D merge=unityyamlmerge eol=lf
|
|
||||||
*.physicMaterial merge=unityyamlmerge eol=lf
|
|
||||||
*.asset merge=unityyamlmerge eol=lf
|
|
||||||
*.meta merge=unityyamlmerge eol=lf
|
|
||||||
*.controller merge=unityyamlmerge eol=lf
|
|
||||||
|
|
||||||
|
|
||||||
## git-lfs ##
|
|
||||||
|
|
||||||
#Image
|
|
||||||
*.jpg filter=lfs diff=lfs merge=lfs -text
|
|
||||||
*.jpeg filter=lfs diff=lfs merge=lfs -text
|
|
||||||
*.png filter=lfs diff=lfs merge=lfs -text
|
|
||||||
*.gif filter=lfs diff=lfs merge=lfs -text
|
|
||||||
*.psd filter=lfs diff=lfs merge=lfs -text
|
|
||||||
*.ai filter=lfs diff=lfs merge=lfs -text
|
|
||||||
|
|
||||||
#Audio
|
|
||||||
*.mp3 filter=lfs diff=lfs merge=lfs -text
|
|
||||||
*.wav filter=lfs diff=lfs merge=lfs -text
|
|
||||||
*.ogg filter=lfs diff=lfs merge=lfs -text
|
|
||||||
|
|
||||||
#Video
|
|
||||||
*.mp4 filter=lfs diff=lfs merge=lfs -text
|
|
||||||
*.mov filter=lfs diff=lfs merge=lfs -text
|
|
||||||
|
|
||||||
#3D Object
|
|
||||||
*.FBX filter=lfs diff=lfs merge=lfs -text
|
|
||||||
*.fbx filter=lfs diff=lfs merge=lfs -text
|
|
||||||
*.blend filter=lfs diff=lfs merge=lfs -text
|
|
||||||
*.obj filter=lfs diff=lfs merge=lfs -text
|
|
||||||
|
|
||||||
#ETC
|
|
||||||
*.a filter=lfs diff=lfs merge=lfs -text
|
|
||||||
*.exr filter=lfs diff=lfs merge=lfs -text
|
|
||||||
*.tga filter=lfs diff=lfs merge=lfs -text
|
|
||||||
*.pdf filter=lfs diff=lfs merge=lfs -text
|
|
||||||
*.zip filter=lfs diff=lfs merge=lfs -text
|
|
||||||
*.dll filter=lfs diff=lfs merge=lfs -text
|
|
||||||
*.unitypackage filter=lfs diff=lfs merge=lfs -text
|
|
||||||
*.aif filter=lfs diff=lfs merge=lfs -text
|
|
||||||
*.ttf filter=lfs diff=lfs merge=lfs -text
|
|
||||||
*.rns filter=lfs diff=lfs merge=lfs -text
|
|
||||||
*.reason filter=lfs diff=lfs merge=lfs -text
|
|
||||||
*.lxo filter=lfs diff=lfs merge=lfs -text
|
|
||||||
@@ -25,81 +25,6 @@
|
|||||||
"type": "UnityEngine.ProBuilder.SemVer, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
|
"type": "UnityEngine.ProBuilder.SemVer, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
|
||||||
"key": "preferences.version",
|
"key": "preferences.version",
|
||||||
"value": "{\"m_Value\":{\"m_Major\":6,\"m_Minor\":0,\"m_Patch\":7,\"m_Build\":-1,\"m_Type\":\"\",\"m_Metadata\":\"\",\"m_Date\":\"\"}}"
|
"value": "{\"m_Value\":{\"m_Major\":6,\"m_Minor\":0,\"m_Patch\":7,\"m_Build\":-1,\"m_Type\":\"\",\"m_Metadata\":\"\",\"m_Date\":\"\"}}"
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
|
|
||||||
"key": "experimental.enabled",
|
|
||||||
"value": "{\"m_Value\":false}"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
|
|
||||||
"key": "editor.showEditorNotifications",
|
|
||||||
"value": "{\"m_Value\":false}"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
|
|
||||||
"key": "lightmapping.autoUnwrapLightmapUV",
|
|
||||||
"value": "{\"m_Value\":true}"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
|
|
||||||
"key": "editor.showSceneInfo",
|
|
||||||
"value": "{\"m_Value\":false}"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
|
|
||||||
"key": "editor.stripProBuilderScriptsOnBuild",
|
|
||||||
"value": "{\"m_Value\":true}"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
|
|
||||||
"key": "editor.autoRecalculateCollisions",
|
|
||||||
"value": "{\"m_Value\":false}"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
|
|
||||||
"key": "editor.autoUpdatePreview",
|
|
||||||
"value": "{\"m_Value\":false}"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
|
|
||||||
"key": "mesh.meshColliderIsConvex",
|
|
||||||
"value": "{\"m_Value\":false}"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
|
|
||||||
"key": "mesh.newShapesSnapToGrid",
|
|
||||||
"value": "{\"m_Value\":true}"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "UnityEngine.ProBuilder.UnwrapParameters, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
|
|
||||||
"key": "lightmapping.defaultLightmapUnwrapParameters",
|
|
||||||
"value": "{\"m_Value\":{\"m_HardAngle\":88.0,\"m_PackMargin\":20.0,\"m_AngleError\":8.0,\"m_AreaError\":15.0}}"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
|
|
||||||
"key": "uv.uvEditorGridSnapIncrement",
|
|
||||||
"value": "{\"m_Value\":0.125}"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "UnityEngine.Material, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
|
|
||||||
"key": "mesh.userMaterial",
|
|
||||||
"value": "{\"m_Value\":{\"instanceID\":0}}"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "UnityEditor.StaticEditorFlags, UnityEditor.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
|
|
||||||
"key": "mesh.defaultStaticEditorFlags",
|
|
||||||
"value": "{\"m_Value\":0}"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "UnityEngine.Rendering.ShadowCastingMode, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
|
|
||||||
"key": "mesh.shadowCastingMode",
|
|
||||||
"value": "{\"m_Value\":1}"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "UnityEngine.ProBuilder.ColliderType, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
|
|
||||||
"key": "mesh.newShapeColliderType",
|
|
||||||
"value": "{\"m_Value\":2}"
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user