Skip to content

Feature/global map #3

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

Merged
Loule95450 merged 27 commits into from
Oct 17, 2024
Merged

Feature/global map #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
d89f871
feature: Add Timelap and player
Thomlam Oct 15, 2024
98f3c1d
fix: fix error with tilemap
Thomlam Oct 15, 2024
de1fb20
feat: First version of Player Movements
AyakorK Oct 15, 2024
970ba94
feat: First version of animation of the player movements
AyakorK Oct 15, 2024
9141437
fix: Update Player prefab to add the animator
AyakorK Oct 16, 2024
acd99f2
feat: Add collisions + modify player prefab
AyakorK Oct 16, 2024
b096fd1
chore: Remove useless folder Art
AyakorK Oct 16, 2024
bcb93ac
feature: Add socket connection and linking it to the back-end
AyakorK Oct 16, 2024
255880a
fix(player_movement): Fix call between backend and game
Loule95450 Oct 16, 2024
0c9cb1d
feature: Ajout de nombreux assets, modifications de la taille, découp…
Thomlam Oct 16, 2024
322816b
fix: Global Fixes about the blurring of the components imported
AyakorK Oct 16, 2024
612c78f
feat: Add first rooms
AyakorK Oct 16, 2024
e1571da
fix: Fix animations and player asset
AyakorK Oct 16, 2024
d8dfbe4
feat: Create Third room
AyakorK Oct 16, 2024
40b3e8a
fix: Reduce player's hitbox
AyakorK Oct 16, 2024
05190d5
feature: Ajouts des systèmes de pièges, connections et manager des pi…
Thomlam Oct 17, 2024
f714a80
fix: compression des images retirer
Thomlam Oct 17, 2024
2c85918
Merge branch 'feature/player_movement' into merge/map_movements
AyakorK Oct 17, 2024
a59d3ae
Merge branch 'merge/map_movements' into feature/global_map
AyakorK Oct 17, 2024
bd50a57
revert: Revert changes on the ground.png.meta
AyakorK Oct 17, 2024
c8260d2
revert: Revert changes made on the furnitures
AyakorK Oct 17, 2024
1421bb5
fix: Fix position of map 1 and player collision
AyakorK Oct 17, 2024
bda3350
fix: Fix rooms placement
AyakorK Oct 17, 2024
0d74353
fix: Fix arrow physics
AyakorK Oct 17, 2024
6c72249
feature: Add doors and animations
Thomlam Oct 17, 2024
b4c1418
Merge branch 'feature/global_map' of https://github.com/CodingFactory…
Thomlam Oct 17, 2024
59d8271
feature: add door system end remove multiple commentary
Thomlam Oct 17, 2024
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.
8 changes: 8 additions & 0 deletions Assets/Animations.meta
View file
Open in desktop

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

75 changes: 75 additions & 0 deletions Assets/Animations/Idle.anim
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
%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: Idle
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: -1136445171, guid: 3551ac8dbe8b24a4fbe3c2bd0ba220aa, type: 3}
- time: 0.083333336
value: {fileID: -1873137710, guid: 3551ac8dbe8b24a4fbe3c2bd0ba220aa, type: 3}
attribute: m_Sprite
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: 0
script: {fileID: 0}
typeID: 212
customType: 23
isPPtrCurve: 1
isIntCurve: 0
isSerializeReferenceCurve: 0
pptrCurveMapping:
- {fileID: -1136445171, guid: 3551ac8dbe8b24a4fbe3c2bd0ba220aa, type: 3}
- {fileID: -1873137710, guid: 3551ac8dbe8b24a4fbe3c2bd0ba220aa, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 0.16666667
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/Idle.anim.meta
View file
Open in desktop

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

81 changes: 81 additions & 0 deletions Assets/Animations/Walk_Back.anim
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
%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: Walk_Back
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: 1882036479, guid: 0cd7916e83c294d47b69508aec074963, type: 3}
- time: 0.083333336
value: {fileID: -1111335450, guid: 0cd7916e83c294d47b69508aec074963, type: 3}
- time: 0.16666667
value: {fileID: -125829354, guid: 0cd7916e83c294d47b69508aec074963, type: 3}
- time: 0.25
value: {fileID: -482648289, guid: 0cd7916e83c294d47b69508aec074963, type: 3}
attribute: m_Sprite
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: 0
script: {fileID: 0}
typeID: 212
customType: 23
isPPtrCurve: 1
isIntCurve: 0
isSerializeReferenceCurve: 0
pptrCurveMapping:
- {fileID: 1882036479, guid: 0cd7916e83c294d47b69508aec074963, type: 3}
- {fileID: -1111335450, guid: 0cd7916e83c294d47b69508aec074963, type: 3}
- {fileID: -125829354, guid: 0cd7916e83c294d47b69508aec074963, type: 3}
- {fileID: -482648289, guid: 0cd7916e83c294d47b69508aec074963, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 0.33333334
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/Walk_Back.anim.meta
View file
Open in desktop

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

81 changes: 81 additions & 0 deletions Assets/Animations/Walk_Front.anim
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
%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: Walk_Front
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: -1501870072, guid: 0cd7916e83c294d47b69508aec074963, type: 3}
- time: 0.083333336
value: {fileID: -912462011, guid: 0cd7916e83c294d47b69508aec074963, type: 3}
- time: 0.16666667
value: {fileID: -60254097, guid: 0cd7916e83c294d47b69508aec074963, type: 3}
- time: 0.25
value: {fileID: 56261314, guid: 0cd7916e83c294d47b69508aec074963, type: 3}
attribute: m_Sprite
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: 0
script: {fileID: 0}
typeID: 212
customType: 23
isPPtrCurve: 1
isIntCurve: 0
isSerializeReferenceCurve: 0
pptrCurveMapping:
- {fileID: -1501870072, guid: 0cd7916e83c294d47b69508aec074963, type: 3}
- {fileID: -912462011, guid: 0cd7916e83c294d47b69508aec074963, type: 3}
- {fileID: -60254097, guid: 0cd7916e83c294d47b69508aec074963, type: 3}
- {fileID: 56261314, guid: 0cd7916e83c294d47b69508aec074963, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 0.33333334
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/Walk_Front.anim.meta
View file
Open in desktop

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

81 changes: 81 additions & 0 deletions Assets/Animations/Walk_Left.anim
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
%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: Walk_Left
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: -1369824421, guid: 0cd7916e83c294d47b69508aec074963, type: 3}
- time: 0.083333336
value: {fileID: 163325544, guid: 0cd7916e83c294d47b69508aec074963, type: 3}
- time: 0.16666667
value: {fileID: 13444011, guid: 0cd7916e83c294d47b69508aec074963, type: 3}
- time: 0.25
value: {fileID: -1357341117, guid: 0cd7916e83c294d47b69508aec074963, type: 3}
attribute: m_Sprite
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: 0
script: {fileID: 0}
typeID: 212
customType: 23
isPPtrCurve: 1
isIntCurve: 0
isSerializeReferenceCurve: 0
pptrCurveMapping:
- {fileID: -1369824421, guid: 0cd7916e83c294d47b69508aec074963, type: 3}
- {fileID: 163325544, guid: 0cd7916e83c294d47b69508aec074963, type: 3}
- {fileID: 13444011, guid: 0cd7916e83c294d47b69508aec074963, type: 3}
- {fileID: -1357341117, guid: 0cd7916e83c294d47b69508aec074963, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 0.33333334
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/Walk_Left.anim.meta
View file
Open in desktop

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

Loading