Skip to content

Commit

Permalink
Merge branch 'staging'
Browse files Browse the repository at this point in the history
  • Loading branch information
Dakotaa committed Mar 19, 2022
2 parents f1b9a2c + 919e71d commit 492127c
Show file tree
Hide file tree
Showing 133 changed files with 108,528 additions and 28,758 deletions.
Binary file modified .DS_Store
Binary file not shown.
8 changes: 6 additions & 2 deletions .idea/.idea.Entangled/.idea/workspace.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

98 changes: 98 additions & 0 deletions Assets/Animations/Player/Player_RESPAWN.anim
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!74 &7400000
AnimationClip:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Player_RESPAWN
serializedVersion: 6
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves: []
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves: []
m_PPtrCurves:
- curve:
- time: 0
value: {fileID: -5958989383473495175, guid: 6500abeda0a86454bbab83d929707276, type: 3}
- time: 0.11666667
value: {fileID: 8478197721113298921, guid: 6500abeda0a86454bbab83d929707276, type: 3}
- time: 0.23333333
value: {fileID: 8059306419194853935, guid: 6500abeda0a86454bbab83d929707276, type: 3}
- time: 0.35
value: {fileID: -8904199614766234923, guid: 6500abeda0a86454bbab83d929707276, type: 3}
- time: 0.46666667
value: {fileID: -3123392144151590596, guid: 6500abeda0a86454bbab83d929707276, type: 3}
- time: 0.56666666
value: {fileID: -7973973483594809674, guid: 6500abeda0a86454bbab83d929707276, type: 3}
- time: 0.7
value: {fileID: -4084456216950298426, guid: 6500abeda0a86454bbab83d929707276, type: 3}
- time: 0.81666666
value: {fileID: 8885007721955496797, guid: 6500abeda0a86454bbab83d929707276, type: 3}
- time: 0.93333334
value: {fileID: -8771908433837487670, guid: 6500abeda0a86454bbab83d929707276, type: 3}
- time: 1.05
value: {fileID: -9037967309669096557, guid: 6500abeda0a86454bbab83d929707276, type: 3}
- time: 1.1666666
value: {fileID: 7335982965871804241, guid: 6500abeda0a86454bbab83d929707276, type: 3}
attribute: m_Sprite
path:
classID: 212
script: {fileID: 0}
m_SampleRate: 60
m_WrapMode: 0
m_Bounds:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
genericBindings:
- serializedVersion: 2
path: 0
attribute: 0
script: {fileID: 0}
typeID: 212
customType: 23
isPPtrCurve: 1
pptrCurveMapping:
- {fileID: -5958989383473495175, guid: 6500abeda0a86454bbab83d929707276, type: 3}
- {fileID: 8478197721113298921, guid: 6500abeda0a86454bbab83d929707276, type: 3}
- {fileID: 8059306419194853935, guid: 6500abeda0a86454bbab83d929707276, type: 3}
- {fileID: -8904199614766234923, guid: 6500abeda0a86454bbab83d929707276, type: 3}
- {fileID: -3123392144151590596, guid: 6500abeda0a86454bbab83d929707276, type: 3}
- {fileID: -7973973483594809674, guid: 6500abeda0a86454bbab83d929707276, type: 3}
- {fileID: -4084456216950298426, guid: 6500abeda0a86454bbab83d929707276, type: 3}
- {fileID: 8885007721955496797, guid: 6500abeda0a86454bbab83d929707276, type: 3}
- {fileID: -8771908433837487670, guid: 6500abeda0a86454bbab83d929707276, type: 3}
- {fileID: -9037967309669096557, guid: 6500abeda0a86454bbab83d929707276, type: 3}
- {fileID: 7335982965871804241, guid: 6500abeda0a86454bbab83d929707276, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 1.1833333
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
m_LoopTime: 1
m_LoopBlend: 0
m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0
m_LoopBlendPositionXZ: 0
m_KeepOriginalOrientation: 0
m_KeepOriginalPositionY: 1
m_KeepOriginalPositionXZ: 0
m_HeightFromFeet: 0
m_Mirror: 0
m_EditorCurves: []
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_Events: []
8 changes: 8 additions & 0 deletions Assets/Animations/Player/Player_RESPAWN.anim.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

51 changes: 51 additions & 0 deletions Assets/Resources/Materials/Text.mat
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Text
m_Shader: {fileID: 10782, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _AlphaTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MaskTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _NormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _ColorMask: 15
- _EnableExternalAlpha: 0
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _Flip: {r: 1, g: 1, b: 1, a: 1}
- _RendererColor: {r: 1, g: 1, b: 1, a: 1}
m_BuildTextureStacks: []
8 changes: 8 additions & 0 deletions Assets/Resources/Materials/Text.mat.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ SpriteRenderer:
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 1.92, y: 0.48}
m_Size: {x: 1, y: 0.25}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ GameObject:
- component: {fileID: 3509673993890282041}
- component: {fileID: 3509673993890282042}
- component: {fileID: 3509673993890282043}
m_Layer: 0
m_Layer: 6
m_Name: Gate
m_TagString: Untagged
m_Icon: {fileID: 0}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ SpriteRenderer:
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 1.92, y: 0.48}
m_Size: {x: 1, y: 0.25}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
Expand Down Expand Up @@ -268,10 +268,10 @@ BoxCollider2D:
m_UsedByComposite: 0
m_Offset: {x: 0, y: 0.12}
m_SpriteTilingProperty:
border: {x: 0.21875, y: 0, z: 0.21354167, w: 0}
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0.5, y: 0.5}
oldSize: {x: 1, y: 0.25}
newSize: {x: 1.92, y: 0.48}
newSize: {x: 1, y: 0.25}
adaptiveTilingThreshold: 0.5
drawMode: 0
adaptiveTiling: 0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ GameObject:
- component: {fileID: 9031979628206350029}
- component: {fileID: 9031979628206350026}
- component: {fileID: 9031979628206350027}
m_Layer: 0
m_Layer: 6
m_Name: DestructiblePanel
m_TagString: Untagged
m_Icon: {fileID: 0}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,9 @@ SpriteRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 1924641603
m_SortingLayer: 2
m_SortingOrder: 0
m_SortingLayerID: -189938303
m_SortingLayer: 1
m_SortingOrder: 2
m_Sprite: {fileID: 6408287865084402522, guid: d7d56be266d8b46539b8e505c7c34ca2, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
Expand Down Expand Up @@ -226,7 +226,7 @@ MonoBehaviour:
m_Color: {r: 1, g: 0, b: 0, a: 1}
m_Intensity: 1
m_LightVolumeOpacity: 0.05
m_ApplyToSortingLayers: 00000000
m_ApplyToSortingLayers: 000000001162b61f81c5adf4
m_LightCookieSprite: {fileID: 0}
m_UseNormalMap: 0
m_LightOrder: 0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ MonoBehaviour:
m_Color: {r: 0, g: 0.8567836, b: 1, a: 1}
m_Intensity: 1
m_LightVolumeOpacity: 0.05
m_ApplyToSortingLayers: 00000000
m_ApplyToSortingLayers: 000000001162b61f81c5adf4
m_LightCookieSprite: {fileID: 0}
m_UseNormalMap: 0
m_LightOrder: 0
Expand Down Expand Up @@ -163,9 +163,9 @@ SpriteRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 1924641603
m_SortingLayer: 2
m_SortingOrder: 0
m_SortingLayerID: -189938303
m_SortingLayer: 1
m_SortingOrder: 2
m_Sprite: {fileID: 4492019630366311335, guid: dde70ea0bc74244e38e1a7d7a7938926, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
Expand Down
Loading

0 comments on commit 492127c

Please sign in to comment.