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 1 - Animations #13

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

Feature 1 - Animations #13

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
2075789
Started new project.
Mar 14, 2020
2b10b22
Added a new scene to fresh start the project.
Mar 15, 2020
801bdf7
Designing the stage.
Mar 15, 2020
491ca50
Movement Script created.
Mar 17, 2020
3f056fe
Feature 1 Animations created.
Mar 20, 2020
c0580aa
Working on Animations.
Mar 20, 2020
184bc27
no message
Mar 20, 2020
055adaf
Character Movement added.
Mar 21, 2020
7d4c184
Refine Script for movement.
Mar 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
22 changes: 22 additions & 0 deletions .vs/2D-Game-Development/xs/UserPrefs.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<Properties StartupConfiguration="{651643A2-7CFD-A5FF-F6C7-515671AA6CC7}|">
<MonoDevelop.Ide.Workbench ActiveDocument="Assets/Scripts/Movement.cs">
<Files>
<File FileName="Assets/2DGamekit/2DGameKit_Third-PartyNotice.txt" Line="1" Column="32" />
<File FileName="Assets/Scripts/Movement.cs" Line="19" Column="27" />
</Files>
<Pads>
<Pad Id="ProjectPad">
<State name="__root__">
<Node name="2D-Game-Development" expanded="True" />
</State>
</Pad>
</Pads>
</MonoDevelop.Ide.Workbench>
<MonoDevelop.Ide.DebuggingService.PinnedWatches />
<MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
<MonoDevelop.Ide.ItemProperties.Assembly-CSharp PreferredExecutionTarget="b9ee9e1b-bc80-45d2-8303-4fa290687779" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
<BreakpointStore />
</MonoDevelop.Ide.DebuggingService.Breakpoints>
<MultiItemStartupConfigurations />
</Properties>
1 change: 1 addition & 0 deletions .vs/2D-Game-Development/xs/project-cache/Assembly-CSharp-Debug.json
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions .vs/2D-Game-Development/xs/project-cache/Assembly-CSharp-Editor-Debug.json
View file
Open in desktop

Large diffs are not rendered by default.

Empty file added .vs/2D-Game-Development/xs/sqlite3/db.lock
View file
Open in desktop
Empty file.
Binary file added .vs/2D-Game-Development/xs/sqlite3/storage.ide
View file
Open in desktop
Binary file not shown.
Binary file added .vs/2D-Game-Development/xs/sqlite3/storage.ide-shm
View file
Open in desktop
Binary file not shown.
Binary file added .vs/2D-Game-Development/xs/sqlite3/storage.ide-wal
View file
Open in desktop
Binary file not shown.
26 changes: 26 additions & 0 deletions 2D-Game-Development.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp", "Assembly-CSharp.csproj", "{651643A2-7CFD-A5FF-F6C7-515671AA6CC7}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp-Editor", "Assembly-CSharp-Editor.csproj", "{39ACBD73-23DC-5869-F584-6A35010B82DD}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{651643A2-7CFD-A5FF-F6C7-515671AA6CC7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{651643A2-7CFD-A5FF-F6C7-515671AA6CC7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{651643A2-7CFD-A5FF-F6C7-515671AA6CC7}.Release|Any CPU.ActiveCfg = Release|Any CPU
{651643A2-7CFD-A5FF-F6C7-515671AA6CC7}.Release|Any CPU.Build.0 = Release|Any CPU
{39ACBD73-23DC-5869-F584-6A35010B82DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{39ACBD73-23DC-5869-F584-6A35010B82DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
{39ACBD73-23DC-5869-F584-6A35010B82DD}.Release|Any CPU.ActiveCfg = Release|Any CPU
{39ACBD73-23DC-5869-F584-6A35010B82DD}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal
518 changes: 258 additions & 260 deletions Assembly-CSharp-Editor.csproj
View file
Open in desktop

Large diffs are not rendered by default.

499 changes: 251 additions & 248 deletions Assembly-CSharp.csproj
View file
Open in desktop

Large diffs are not rendered by default.

240 changes: 9 additions & 231 deletions Assets/2DGamekit/Art/Animations/AnimationClips/Ellen/Airborne/Ellen_Jump15.anim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@
--- !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_Jump15
serializedVersion: 6
m_Legacy: 0
Expand All @@ -15,156 +16,22 @@ 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: 1
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: 2.1
inSlope: 0
outSlope: 0
tangentMode: 136
- serializedVersion: 2
time: 1
value: 2
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: 1
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: 1.05
inSlope: 0
outSlope: 0
tangentMode: 136
- serializedVersion: 2
time: 1
value: 1
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_PPtrCurves:
- curve:
- time: 0
value: {fileID: 21300000, guid: 13aa9a4a1bc68064c9e5e17a86df2666, type: 3}
- time: 1
value: {fileID: 21300000, guid: 13aa9a4a1bc68064c9e5e17a86df2666, type: 3}
attribute: m_Sprite
path:
classID: 212
script: {fileID: 0}
m_FloatCurves: []
m_PPtrCurves: []
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: 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
pptrCurveMapping:
- {fileID: 21300000, guid: 13aa9a4a1bc68064c9e5e17a86df2666, type: 3}
- {fileID: 21300000, guid: 13aa9a4a1bc68064c9e5e17a86df2666, type: 3}
genericBindings: []
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 1.0166667
m_StopTime: 1
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
Expand All @@ -179,97 +46,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: 1
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: 2.1
inSlope: 0
outSlope: 0
tangentMode: 136
- serializedVersion: 2
time: 1
value: 2
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: 1
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: 1.05
inSlope: 0
outSlope: 0
tangentMode: 136
- serializedVersion: 2
time: 1
value: 1
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: []
8 changes: 4 additions & 4 deletions Assets/2DGamekit/Art/Animations/AnimationClips/Ellen/Ellen_Jump.anim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@
--- !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_Jump
serializedVersion: 6
m_Legacy: 0
Expand Down Expand Up @@ -77,7 +78,7 @@ AnimationClip:
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
m_LoopTime: 1
m_LoopTime: 0
m_LoopBlend: 0
m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0
Expand All @@ -91,5 +92,4 @@ AnimationClip:
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_GenerateMotionCurves: 0
m_Events: []
6 changes: 3 additions & 3 deletions Assets/2DGamekit/Art/Animations/AnimationClips/Ellen/Ellen_Melee1.anim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@
--- !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_Melee1
serializedVersion: 6
m_Legacy: 0
Expand Down Expand Up @@ -76,5 +77,4 @@ AnimationClip:
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_GenerateMotionCurves: 0
m_Events: []
6 changes: 3 additions & 3 deletions Assets/2DGamekit/Art/Animations/AnimationClips/Enemies/Chomper/ChomperIdle.anim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@
--- !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: ChomperIdle
serializedVersion: 6
m_Legacy: 0
Expand Down Expand Up @@ -151,5 +152,4 @@ AnimationClip:
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_GenerateMotionCurves: 0
m_Events: []
Loading