Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
4dd76dc
Doing Animations
meteoralpha23 Oct 21, 2024
775e31d
Assignment - Crouch Animation
meteoralpha23 Oct 21, 2024
fc33251
Merge pull request #1 from meteoralpha23/Feature1-Animations
meteoralpha23 Oct 21, 2024
97a42f3
playercontroller
meteoralpha23 Oct 22, 2024
e38f19e
Merge pull request #2 from meteoralpha23/Feature2-PlayerController
meteoralpha23 Oct 22, 2024
60b5df8
assignement2
meteoralpha23 Oct 22, 2024
5350610
Merge branch 'master' into Feature2-PlayerController
meteoralpha23 Oct 22, 2024
d0ff612
Merge pull request #3 from meteoralpha23/Feature2-PlayerController
meteoralpha23 Oct 22, 2024
f05c1c1
movement
meteoralpha23 Oct 24, 2024
4602f34
Merge pull request #4 from meteoralpha23/Feature3-Movement
meteoralpha23 Oct 24, 2024
f4574eb
dd
meteoralpha23 Oct 27, 2024
aaa4473
Merge pull request #5 from meteoralpha23/TileMapSetup
meteoralpha23 Oct 27, 2024
ee0e4cf
DOne reload scene
meteoralpha23 Oct 27, 2024
32e20cd
Merge pull request #6 from meteoralpha23/TileMapSetup
meteoralpha23 Oct 27, 2024
700e1a6
Collectables
meteoralpha23 Oct 27, 2024
768c4ab
Merge pull request #7 from meteoralpha23/Feature5-CollectableSetup
meteoralpha23 Oct 27, 2024
fb23a24
Aniamtion Key
meteoralpha23 Oct 27, 2024
d8cf13c
Merge pull request #8 from meteoralpha23/Feature5-CollectableSetup
meteoralpha23 Oct 27, 2024
92deb88
Patrolling Enemy
meteoralpha23 Oct 28, 2024
fb98150
Update EnemyController.cs
meteoralpha23 Oct 28, 2024
2ded5f6
Merge pull request #9 from meteoralpha23/Feature5-CollectableSetup
meteoralpha23 Oct 28, 2024
7784054
heart
meteoralpha23 Oct 31, 2024
68f05fd
Merge pull request #10 from meteoralpha23/Feature5-CollectableSetup
meteoralpha23 Oct 31, 2024
cc489ef
Two enemies
meteoralpha23 Oct 31, 2024
5846176
Merge pull request #11 from meteoralpha23/Feature5-CollectableSetup
meteoralpha23 Oct 31, 2024
9476963
22
meteoralpha23 Nov 1, 2024
7f808d9
UI
meteoralpha23 Nov 1, 2024
11402ef
Merge pull request #13 from meteoralpha23/master
meteoralpha23 Nov 1, 2024
2c1b898
addedquit
meteoralpha23 Nov 1, 2024
85e6348
Update 1.unity
meteoralpha23 Nov 1, 2024
241a8fe
Merge branch 'Feature5-CollectableSetup' of https://github.com/meteor…
meteoralpha23 Nov 1, 2024
d2be802
lobbysetup
meteoralpha23 Nov 2, 2024
fa7d6d7
levelunlock]
meteoralpha23 Nov 2, 2024
244acdc
polishing
meteoralpha23 Nov 2, 2024
7dc28cd
DOne
meteoralpha23 Nov 2, 2024
be982ed
DOne
meteoralpha23 Nov 2, 2024
966a993
commiting
meteoralpha23 Nov 6, 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
8 changes: 8 additions & 0 deletions Assets/AudioMixer.meta

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

65 changes: 65 additions & 0 deletions Assets/AudioMixer/NewAudioMixer.mixer
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!241 &24100000
AudioMixerController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: NewAudioMixer
m_OutputGroup: {fileID: 0}
m_MasterGroup: {fileID: 24300002}
m_Snapshots:
- {fileID: 24500006}
m_StartSnapshot: {fileID: 24500006}
m_SuspendThreshold: -80
m_EnableSuspend: 1
m_UpdateMode: 0
m_ExposedParameters: []
m_AudioMixerGroupViews: []
m_CurrentViewIndex: 0
m_TargetSnapshot: {fileID: 24500006}
--- !u!243 &24300002
AudioMixerGroupController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Master
m_AudioMixer: {fileID: 24100000}
m_GroupID: 5ddfc166582f89e4b8f84d413998e806
m_Children: []
m_Volume: 84902f77740544243b7ed43dd795f971
m_Pitch: abd20baeb911f0048a3d150b4a7157eb
m_Send: 00000000000000000000000000000000
m_Effects:
- {fileID: 24400004}
m_UserColorIndex: 0
m_Mute: 0
m_Solo: 0
m_BypassEffects: 0
--- !u!244 &24400004
AudioMixerEffectController:
m_ObjectHideFlags: 3
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_EffectID: d088d16de126e03429e5656ebcd3ef5c
m_EffectName: Attenuation
m_MixLevel: edd6e9b25ecfdb347953376b24a0c73f
m_Parameters: []
m_SendTarget: {fileID: 0}
m_EnableWetMix: 0
m_Bypass: 0
--- !u!245 &24500006
AudioMixerSnapshotController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Snapshot
m_AudioMixer: {fileID: 24100000}
m_SnapshotID: 8e6090b7eddda7743a51b55c18dd5ca9
m_FloatValues: {}
m_TransitionOverrides: {}
8 changes: 8 additions & 0 deletions Assets/AudioMixer/NewAudioMixer.mixer.meta

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

8 changes: 8 additions & 0 deletions Assets/Game Assets/Art/Animations/Enemy.meta

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

72 changes: 72 additions & 0 deletions Assets/Game Assets/Art/Animations/Enemy/Enemy.controller
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1107 &-1279979139065281050
AnimatorStateMachine:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Base Layer
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: 8157049650449269804}
m_Position: {x: 330, y: 190, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
m_AnyStatePosition: {x: 50, y: 20, z: 0}
m_EntryPosition: {x: 50, y: 120, z: 0}
m_ExitPosition: {x: 800, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: 8157049650449269804}
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Enemy
serializedVersion: 5
m_AnimatorParameters: []
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
m_StateMachine: {fileID: -1279979139065281050}
m_Mask: {fileID: 0}
m_Motions: []
m_Behaviours: []
m_BlendingMode: 0
m_SyncedLayerIndex: -1
m_DefaultWeight: 0
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
--- !u!1102 &8157049650449269804
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: EnemyRun
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: f0028d5f9ba94004cb8a08291125f3d1, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
8 changes: 8 additions & 0 deletions Assets/Game Assets/Art/Animations/Enemy/Enemy.controller.meta

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

159 changes: 159 additions & 0 deletions Assets/Game Assets/Art/Animations/Enemy/EnemyIdle.anim
Original file line number Diff line number Diff line change
@@ -0,0 +1,159 @@
%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: EnemyIdle
serializedVersion: 7
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves: []
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves: []
m_PPtrCurves:
- serializedVersion: 2
curve:
- time: 0
value: {fileID: 21300000, guid: 41ee8205a421b1643824c4bd4c9b12b0, type: 3}
- time: 0.05
value: {fileID: 21300000, guid: f14aa10c3b4eb5b47860e729e2144c28, type: 3}
- time: 0.1
value: {fileID: 21300000, guid: a64b8a0d006d7b744b431b7cd3e59096, type: 3}
- time: 0.15
value: {fileID: 21300000, guid: 9e540f44219d80243bec5e2191787a0c, type: 3}
- time: 0.2
value: {fileID: 21300000, guid: c00121950f177f84092fd15f53c6ac66, type: 3}
- time: 0.25
value: {fileID: 21300000, guid: a25859ca3789d8a469bdd28a7d38daf2, type: 3}
- time: 0.3
value: {fileID: 21300000, guid: 26aea5a92fc76f648bb6522f06a0af58, type: 3}
- time: 0.35
value: {fileID: 21300000, guid: dae848790acd29544a951ec295aecf71, type: 3}
- time: 0.4
value: {fileID: 21300000, guid: 54bda8bcfb03f4345aafea5fe8271478, type: 3}
- time: 0.45
value: {fileID: 21300000, guid: f7636f79f29fce1469dfb21774e2b9d7, type: 3}
- time: 0.5
value: {fileID: 21300000, guid: 8ae4d681ab837c64796c0b72ee2584a0, type: 3}
- time: 0.55
value: {fileID: 21300000, guid: 22f7a3407a0448d438b85694136896c1, type: 3}
- time: 0.6
value: {fileID: 21300000, guid: d3ae7713c92135644b592b6979acbcfc, type: 3}
- time: 0.65
value: {fileID: 21300000, guid: c10ee680b45acec46af60e470d8c1930, type: 3}
- time: 0.7
value: {fileID: 21300000, guid: 8b571ba119e277145b0b92cd8fd42067, type: 3}
- time: 0.75
value: {fileID: 21300000, guid: 75a36c8886a27f54b833c41de3d11d24, type: 3}
- time: 0.8
value: {fileID: 21300000, guid: 312a5bfa1cd438440b81906da98959f9, type: 3}
- time: 0.85
value: {fileID: 21300000, guid: ae7c3e30807a6b14ea27333b478b7159, type: 3}
- time: 0.9
value: {fileID: 21300000, guid: c3bc842a37054c74bbc28d1f34c9847a, type: 3}
- time: 0.95
value: {fileID: 21300000, guid: 72182c4737bc6a242be25cda1beacbf4, type: 3}
- time: 1
value: {fileID: 21300000, guid: 02d12d99a7d9fc24fa0f9e2472426c7b, type: 3}
- time: 1.05
value: {fileID: 21300000, guid: 38c40e88299ccf042b83f09b5c3fd89b, type: 3}
- time: 1.1
value: {fileID: 21300000, guid: 6c05bc2e66e3ff342abf6c6128d48be8, type: 3}
- time: 1.15
value: {fileID: 21300000, guid: a003b41375f47594a9d754a4e55dc568, type: 3}
- time: 1.2
value: {fileID: 21300000, guid: a0740f7c6b0a21346b139ff42dc3cb17, type: 3}
- time: 1.25
value: {fileID: 21300000, guid: 6de87e9f00722e74d9fc96304b8f1a3d, type: 3}
- time: 1.3
value: {fileID: 21300000, guid: 6e07004c8f0965d4ab66a275e02b77a0, type: 3}
- time: 1.35
value: {fileID: 21300000, guid: c476985fb9af3ff4aafceffed501e06a, type: 3}
- time: 1.4
value: {fileID: 21300000, guid: a5cc0836f318e7d47928222a8a8c6bd5, type: 3}
- time: 1.45
value: {fileID: 21300000, guid: 030bf29ece336fa4590a0d4039eb5a00, type: 3}
attribute: m_Sprite
path:
classID: 212
script: {fileID: 0}
flags: 2
m_SampleRate: 20
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
isIntCurve: 0
isSerializeReferenceCurve: 0
pptrCurveMapping:
- {fileID: 21300000, guid: 41ee8205a421b1643824c4bd4c9b12b0, type: 3}
- {fileID: 21300000, guid: f14aa10c3b4eb5b47860e729e2144c28, type: 3}
- {fileID: 21300000, guid: a64b8a0d006d7b744b431b7cd3e59096, type: 3}
- {fileID: 21300000, guid: 9e540f44219d80243bec5e2191787a0c, type: 3}
- {fileID: 21300000, guid: c00121950f177f84092fd15f53c6ac66, type: 3}
- {fileID: 21300000, guid: a25859ca3789d8a469bdd28a7d38daf2, type: 3}
- {fileID: 21300000, guid: 26aea5a92fc76f648bb6522f06a0af58, type: 3}
- {fileID: 21300000, guid: dae848790acd29544a951ec295aecf71, type: 3}
- {fileID: 21300000, guid: 54bda8bcfb03f4345aafea5fe8271478, type: 3}
- {fileID: 21300000, guid: f7636f79f29fce1469dfb21774e2b9d7, type: 3}
- {fileID: 21300000, guid: 8ae4d681ab837c64796c0b72ee2584a0, type: 3}
- {fileID: 21300000, guid: 22f7a3407a0448d438b85694136896c1, type: 3}
- {fileID: 21300000, guid: d3ae7713c92135644b592b6979acbcfc, type: 3}
- {fileID: 21300000, guid: c10ee680b45acec46af60e470d8c1930, type: 3}
- {fileID: 21300000, guid: 8b571ba119e277145b0b92cd8fd42067, type: 3}
- {fileID: 21300000, guid: 75a36c8886a27f54b833c41de3d11d24, type: 3}
- {fileID: 21300000, guid: 312a5bfa1cd438440b81906da98959f9, type: 3}
- {fileID: 21300000, guid: ae7c3e30807a6b14ea27333b478b7159, type: 3}
- {fileID: 21300000, guid: c3bc842a37054c74bbc28d1f34c9847a, type: 3}
- {fileID: 21300000, guid: 72182c4737bc6a242be25cda1beacbf4, type: 3}
- {fileID: 21300000, guid: 02d12d99a7d9fc24fa0f9e2472426c7b, type: 3}
- {fileID: 21300000, guid: 38c40e88299ccf042b83f09b5c3fd89b, type: 3}
- {fileID: 21300000, guid: 6c05bc2e66e3ff342abf6c6128d48be8, type: 3}
- {fileID: 21300000, guid: a003b41375f47594a9d754a4e55dc568, type: 3}
- {fileID: 21300000, guid: a0740f7c6b0a21346b139ff42dc3cb17, type: 3}
- {fileID: 21300000, guid: 6de87e9f00722e74d9fc96304b8f1a3d, type: 3}
- {fileID: 21300000, guid: 6e07004c8f0965d4ab66a275e02b77a0, type: 3}
- {fileID: 21300000, guid: c476985fb9af3ff4aafceffed501e06a, type: 3}
- {fileID: 21300000, guid: a5cc0836f318e7d47928222a8a8c6bd5, type: 3}
- {fileID: 21300000, guid: 030bf29ece336fa4590a0d4039eb5a00, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 1.5
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/Game Assets/Art/Animations/Enemy/EnemyIdle.anim.meta

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

Loading