Skip to content
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

Feature 10 polish #467

Open
wants to merge 13 commits into
base: master
Choose a base branch
from
Open

Feature 10 polish #467

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
19c1292
movement
kumarvnsh Aug 30, 2024
62b4d65
Movement
kumarvnsh Aug 30, 2024
c6cd7f1
Tilemap
kumarvnsh Sep 3, 2024
3e3dc89
Death After Falling From Platform
kumarvnsh Sep 3, 2024
8910683
Enemy
kumarvnsh Oct 9, 2024
e3955eb
Hearts and lives
kumarvnsh Oct 9, 2024
c78f4c3
Two Enemies
kumarvnsh Oct 9, 2024
bc5eccd
Lobby
kumarvnsh Oct 9, 2024
9ec6703
GameOver UI
kumarvnsh Oct 10, 2024
8fe65ca
level selection
kumarvnsh Oct 10, 2024
6ec96bc
sounds
kumarvnsh Oct 20, 2024
b598581
Updated scripts
kumarvnsh Nov 3, 2024
da6c26c
added new features
kumarvnsh Nov 12, 2024
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
1 change: 1 addition & 0 deletions .gitattributes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* text=auto
320 changes: 12 additions & 308 deletions Assets/Game Assets/Art/Animations/AnimationClips/Ellen/Ellen_Crouch.anim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@
--- !u!74 &7400000
AnimationClip:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Ellen_Crouch
serializedVersion: 6
serializedVersion: 7
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
Expand All @@ -15,145 +16,10 @@ AnimationClip:
m_EulerCurves: []
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 2
time: 0
value: 0.5
inSlope: 0
outSlope: 0
tangentMode: 136
- serializedVersion: 2
time: 0.4166667
value: 0.5
inSlope: 0
outSlope: 0
tangentMode: 136
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Size.x
path:
classID: 70
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 2
time: 0
value: 1.958519
inSlope: 0
outSlope: 0
tangentMode: 136
- serializedVersion: 2
time: 0.083333336
value: 1.485799
inSlope: -4.2209086
outSlope: -4.2209086
tangentMode: 136
- serializedVersion: 2
time: 0.16666667
value: 1.2550342
inSlope: -0.5912762
outSlope: -0.5912762
tangentMode: 136
- serializedVersion: 2
time: 0.25
value: 1.2303977
inSlope: 0
outSlope: 0
tangentMode: 136
- serializedVersion: 2
time: 0.33333334
value: 1.2522385
inSlope: 0.026395798
outSlope: 0.026395798
tangentMode: 136
- serializedVersion: 2
time: 0.4166667
value: 1.2533383
inSlope: 0
outSlope: 0
tangentMode: 136
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Size.y
path:
classID: 70
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 2
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
- serializedVersion: 2
time: 0.4166667
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Offset.x
path:
classID: 70
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 2
time: 0
value: 0.9792595
inSlope: 0
outSlope: 0
tangentMode: 136
- serializedVersion: 2
time: 0.083333336
value: 0.7428995
inSlope: -2.1104543
outSlope: -2.1104543
tangentMode: 136
- serializedVersion: 2
time: 0.16666667
value: 0.6275171
inSlope: -0.2956381
outSlope: -0.2956381
tangentMode: 136
- serializedVersion: 2
time: 0.25
value: 0.61519885
inSlope: 0
outSlope: 0
tangentMode: 136
- serializedVersion: 2
time: 0.33333334
value: 0.62611926
inSlope: 0.013197899
outSlope: 0.013197899
tangentMode: 136
- serializedVersion: 2
time: 0.4166667
value: 0.62666917
inSlope: 0
outSlope: 0
tangentMode: 136
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Offset.y
path:
classID: 70
script: {fileID: 0}
m_FloatCurves: []
m_PPtrCurves:
- curve:
- serializedVersion: 2
curve:
- time: 0
value: {fileID: 21300000, guid: 5a1cef7e9c9ed034da742d0e08ea786a, type: 3}
- time: 0.083333336
Expand All @@ -168,48 +34,23 @@ AnimationClip:
path:
classID: 212
script: {fileID: 0}
flags: 2
m_SampleRate: 12
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: 2368279999
script: {fileID: 0}
typeID: 70
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 1872933342
script: {fileID: 0}
typeID: 70
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 0
script: {fileID: 0}
typeID: 212
customType: 23
isPPtrCurve: 1
- serializedVersion: 2
path: 0
attribute: 4197328169
script: {fileID: 0}
typeID: 70
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 413499720
script: {fileID: 0}
typeID: 70
customType: 0
isPPtrCurve: 0
isIntCurve: 0
isSerializeReferenceCurve: 0
pptrCurveMapping:
- {fileID: 21300000, guid: 5a1cef7e9c9ed034da742d0e08ea786a, type: 3}
- {fileID: 21300000, guid: a9c37448b62c0d149aced6ded9e44e4a, type: 3}
Expand All @@ -221,7 +62,7 @@ AnimationClip:
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 0.4166667
m_StopTime: 0.41666666
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
Expand All @@ -236,145 +77,8 @@ AnimationClip:
m_KeepOriginalPositionXZ: 0
m_HeightFromFeet: 0
m_Mirror: 0
m_EditorCurves:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 2
time: 0
value: 0.5
inSlope: 0
outSlope: 0
tangentMode: 136
- serializedVersion: 2
time: 0.4166667
value: 0.5
inSlope: 0
outSlope: 0
tangentMode: 136
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Size.x
path:
classID: 70
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 2
time: 0
value: 1.958519
inSlope: 0
outSlope: 0
tangentMode: 136
- serializedVersion: 2
time: 0.083333336
value: 1.485799
inSlope: -4.2209086
outSlope: -4.2209086
tangentMode: 136
- serializedVersion: 2
time: 0.16666667
value: 1.2550342
inSlope: -0.5912762
outSlope: -0.5912762
tangentMode: 136
- serializedVersion: 2
time: 0.25
value: 1.2303977
inSlope: 0
outSlope: 0
tangentMode: 136
- serializedVersion: 2
time: 0.33333334
value: 1.2522385
inSlope: 0.026395798
outSlope: 0.026395798
tangentMode: 136
- serializedVersion: 2
time: 0.4166667
value: 1.2533383
inSlope: 0
outSlope: 0
tangentMode: 136
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Size.y
path:
classID: 70
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 2
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
- serializedVersion: 2
time: 0.4166667
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Offset.x
path:
classID: 70
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 2
time: 0
value: 0.9792595
inSlope: 0
outSlope: 0
tangentMode: 136
- serializedVersion: 2
time: 0.083333336
value: 0.7428995
inSlope: -2.1104543
outSlope: -2.1104543
tangentMode: 136
- serializedVersion: 2
time: 0.16666667
value: 0.6275171
inSlope: -0.2956381
outSlope: -0.2956381
tangentMode: 136
- serializedVersion: 2
time: 0.25
value: 0.61519885
inSlope: 0
outSlope: 0
tangentMode: 136
- serializedVersion: 2
time: 0.33333334
value: 0.62611926
inSlope: 0.013197899
outSlope: 0.013197899
tangentMode: 136
- serializedVersion: 2
time: 0.4166667
value: 0.62666917
inSlope: 0
outSlope: 0
tangentMode: 136
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Offset.y
path:
classID: 70
script: {fileID: 0}
m_EditorCurves: []
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_GenerateMotionCurves: 0
m_Events: []
Loading