Skip to content

Feature/addition of corridors#4

Merged
Loule95450 merged 30 commits intodevelopfrom
feature/addition_of_corridors
Oct 17, 2024
Merged

Feature/addition of corridors#4
Loule95450 merged 30 commits intodevelopfrom
feature/addition_of_corridors

Conversation

@Thomlam
Copy link
Copy Markdown
Contributor

@Thomlam Thomlam commented Oct 17, 2024

This pull request includes the addition of several animation and prefab files to the Unity project. The changes encompass new animation clips, their metadata, and the creation of a player prefab with associated components.

Animation Additions:

  • Added Idle, Walk_Back, Walk_Front, Walk_Left, and Walk_Right animation clips with their respective metadata files. (Assets/Animations/Idle.anim [1]], Assets/Animations/Idle.anim.meta [2]], Assets/Animations/Walk_Back.anim [3]], Assets/Animations/Walk_Back.anim.meta [4]], Assets/Animations/Walk_Front.anim [5]], Assets/Animations/Walk_Front.anim.meta [6]], Assets/Animations/Walk_Left.anim [7]], Assets/Animations/Walk_Left.anim.meta [8]], Assets/Animations/Walk_Right.anim [9]], Assets/Animations/Walk_Right.anim.meta [10]])

Prefab Additions:

  • Created Player prefab with components such as Transform, SpriteRenderer, MonoBehaviour, Rigidbody2D, Animator, and PolygonCollider2D. (Assets/Prefabs/Player.prefab [1]], Assets/Prefabs/Player.prefab.meta [2]])
  • Added metadata for Grid, Grid Variant, and RoomSystem prefabs. (Assets/Prefabs/Grid.prefab.meta [1]], Assets/Prefabs/Grid Variant.prefab.meta [2]], Assets/Prefabs/RoomSystem.meta [3]])

Other Metadata:

  • Updated Assets/Animations.meta to include the new animations folder.
  • Updated Assets/Prefabs.meta to include the new prefabs folder.
  • Added PlayerMovementAnimatorController.controller.meta for the player animation controller.

Thomlam and others added 27 commits October 15, 2024 16:12
@Thomlam
feature: Add Timelap and player
d89f871
@Thomlam
fix: fix error with tilemap
98f3c1d
@AyakorK
feat: First version of Player Movements
de1fb20
@AyakorK
feat: First version of animation of the player movements
970ba94
@AyakorK
fix: Update Player prefab to add the animator
9141437
@AyakorK
feat: Add collisions + modify player prefab
acd99f2
@AyakorK
chore: Remove useless folder Art
b096fd1
@AyakorK
feature: Add socket connection and linking it to the back-end
bcb93ac
@Loule95450
fix(player_movement): Fix call between backend and game
255880a
@Thomlam
feature: Ajout de nombreux assets, modifications de la taille, découp…
0c9cb1d 
…age assets
@AyakorK
fix: Global Fixes about the blurring of the components imported
322816b
@AyakorK
feat: Add first rooms
612c78f
@AyakorK
fix: Fix animations and player asset
e1571da
@AyakorK
feat: Create Third room
d8dfbe4
@AyakorK
fix: Reduce player's hitbox
40b3e8a
@Thomlam
feature: Ajouts des systèmes de pièges, connections et manager des pi…
05190d5 
…èges, animations de la crossbow, ajouts des sprites de l'arrow et de ces effets puis damages, changements tags du joueurs et des walls, changement et ajouts des systèmes de vie du joueurs, changements première phase de l'ui et création de celui-ci
@Thomlam
fix: compression des images retirer
f714a80
@AyakorK
Merge branch 'feature/player_movement' into merge/map_movements
2c85918
@AyakorK
Merge branch 'merge/map_movements' into feature/global_map
a59d3ae
@AyakorK
revert: Revert changes on the ground.png.meta
bd50a57
@AyakorK
revert: Revert changes made on the furnitures
c8260d2
@AyakorK
fix: Fix position of map 1 and player collision
1421bb5
@AyakorK
fix: Fix rooms placement
bda3350
@AyakorK
fix: Fix arrow physics
0d74353
@Thomlam
feature: Add doors and animations
6c72249
@Thomlam
Merge branch 'feature/global_map' of https://github.com/CodingFactory…
b4c1418 
…-Repos/deathrun-game into feature/global_map
@AyakorK
feat: Addition of corridors
3684a9a
@Thomlam Thomlam self-assigned this Oct 17, 2024
@Loule95450 Loule95450 self-requested a review October 17, 2024 13:25
@Loule95450 Loule95450 merged commit 2e8be74 into develop Oct 17, 2024
@Loule95450 Loule95450 deleted the feature/addition_of_corridors branch October 17, 2024 13:39
Thomlam added a commit that referenced this pull request Oct 23, 2024
@Thomlam @Loule95450
@AyakorK @coderabbitai
Develop (#20)
70c8ed2 
* Feature/initialization (#1)

* feature: Init repository

* chore: add git ignore

* chore: Upgrade .gitignore

* chore: Remove all ignored files

* chore: Removed all files that are in the .gitignore

---------

Co-authored-by: Thomas Lamiable <lamiablethomas@gmail.com>

* docs: Update README.md

* Feature/global map (#3)

* feature: Add Timelap and player

* fix: fix error with tilemap

* feat: First version of Player Movements

* feat: First version of animation of the player movements

* fix: Update Player prefab to add the animator

* feat: Add collisions + modify player prefab

* chore: Remove useless folder Art

* feature: Add socket connection and linking it to the back-end

* fix(player_movement): Fix call between backend and game

* feature: Ajout de nombreux assets, modifications de la taille, découpage assets

* fix: Global Fixes about the blurring of the components imported

* feat: Add first rooms

* fix: Fix animations and player asset

* feat: Create Third room

* fix: Reduce player's hitbox

* feature: Ajouts des systèmes de pièges, connections et manager des pièges, animations de la crossbow, ajouts des sprites de l'arrow et de ces effets puis damages, changements tags du joueurs et des walls, changement et ajouts des systèmes de vie du joueurs, changements première phase de l'ui et création de celui-ci

* fix: compression des images retirer

* revert: Revert changes on the ground.png.meta

* revert: Revert changes made on the furnitures

* fix: Fix position of map 1 and player collision

* fix: Fix rooms placement

* fix: Fix arrow physics

* feature: Add doors and animations

* feature: add door system end remove multiple commentary

---------

Co-authored-by: AyakorK <guillaume.moret@yahoo.com>
Co-authored-by: Loule | Louis <35641311+Loule95450@users.noreply.github.com>

* Feature/addition of corridors (#4)

* feature: Add Timelap and player

* fix: fix error with tilemap

* feat: First version of Player Movements

* feat: First version of animation of the player movements

* fix: Update Player prefab to add the animator

* feat: Add collisions + modify player prefab

* chore: Remove useless folder Art

* feature: Add socket connection and linking it to the back-end

* fix(player_movement): Fix call between backend and game

* feature: Ajout de nombreux assets, modifications de la taille, découpage assets

* fix: Global Fixes about the blurring of the components imported

* feat: Add first rooms

* fix: Fix animations and player asset

* feat: Create Third room

* fix: Reduce player's hitbox

* feature: Ajouts des systèmes de pièges, connections et manager des pièges, animations de la crossbow, ajouts des sprites de l'arrow et de ces effets puis damages, changements tags du joueurs et des walls, changement et ajouts des systèmes de vie du joueurs, changements première phase de l'ui et création de celui-ci

* fix: compression des images retirer

* revert: Revert changes on the ground.png.meta

* revert: Revert changes made on the furnitures

* fix: Fix position of map 1 and player collision

* fix: Fix rooms placement

* fix: Fix arrow physics

* feature: Add doors and animations

* feat: Addition of corridors

* feature: add door system end remove multiple commentary

---------

Co-authored-by: AyakorK <guillaume.moret@yahoo.com>
Co-authored-by: Loule | Louis <35641311+Loule95450@users.noreply.github.com>

* feature: First try to add level move in Unity

* feat: fix Arrow, upgrade door system

* feat: Fix multiple problem

* fix: fix door teleport with disable player public selected

* feat: Add Menu system, update styling

* feat: Add Dialog system, add multiple coroutine for enable or disable dialog box

* feat: Level move (#7)

* feature: First try to add level move in Unity

* feat: fix Arrow, upgrade door system

* feat: Fix multiple problem

* fix: fix door teleport with disable player public selected

* feat: Addition of traps using sockets (#6)

* feat: Add auto implementation from website of traps

* chore: Add environment variables to UnityProject (#5)

* fix: Remove useless Log that was crashed

* fix(level_move): Replace hard-coded values ​​with variables for better flexibility

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

---------

Co-authored-by: Thomas Lamiable <lamiablethomas@gmail.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* feat: Add and fix prefab, add DevRoom prefab

* fix: fix door

* feat: Add Socket to props to send them to back-end (#8)

* feature: First try to add level move in Unity

* feat: fix Arrow, upgrade door system

* feat: Fix multiple problem

* fix: fix door teleport with disable player public selected

* feat: Addition of traps using sockets (#6)

* feat: Add auto implementation from website of traps

* chore: Add environment variables to UnityProject (#5)

* fix: Remove useless Log that was crashed

* feat: Add link to props using sockets

* feat: Add a unique socket system manager

---------

Co-authored-by: Thomas Lamiable <lamiablethomas@gmail.com>

* hotfix: Delete code duplication

* Feature/menu (#11)

* merge: Merge menu and develop and fix little issues (#10)

* merge: Merge develop to menu (#9)

* feat: Level move (#7)

* feature: First try to add level move in Unity

* feat: fix Arrow, upgrade door system

* feat: Fix multiple problem

* fix: fix door teleport with disable player public selected

* feat: Addition of traps using sockets (#6)

* feat: Add auto implementation from website of traps

* chore: Add environment variables to UnityProject (#5)

* fix: Remove useless Log that was crashed

* fix(level_move): Replace hard-coded values ​​with variables for better flexibility

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

---------

Co-authored-by: Thomas Lamiable <lamiablethomas@gmail.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* feat: Add Socket to props to send them to back-end (#8)

* feature: First try to add level move in Unity

* feat: fix Arrow, upgrade door system

* feat: Fix multiple problem

* fix: fix door teleport with disable player public selected

* feat: Addition of traps using sockets (#6)

* feat: Add auto implementation from website of traps

* chore: Add environment variables to UnityProject (#5)

* fix: Remove useless Log that was crashed

* feat: Add link to props using sockets

* feat: Add a unique socket system manager

---------

Co-authored-by: Thomas Lamiable <lamiablethomas@gmail.com>

---------

Co-authored-by: Thomas Lamiable <lamiablethomas@gmail.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* fix: Remove duplication of code

* fix: Fix Idle animation

---------

Co-authored-by: Thomas Lamiable <lamiablethomas@gmail.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* revert: Revert changes from EmptyRoom that breaked doors

* feat:Some menu option had

* feat: Add pause system, return to menu and restart game, fix OnLoadScene in unity for hard reset player state

* chore: remove commentary for trap manager

---------

Co-authored-by: Guillaume MORET <90462045+AyakorK@users.noreply.github.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
Co-authored-by: AyakorK <guillaume.moret@yahoo.com>

* fix: remove duplicata room

* feat: Add a visual timer prefab (V.1.0) (#12)

Co-authored-by: AyakorK <guillaume.moret@yahoo.com>

* feat: Add dynamic environment interaction system and new events (#13)

- Implement player interaction system with the environment
- Add dynamic room system:
  - Events now added based on room number and corridor-specific stages
  - Dynamic event generation based on the current floor
- New events added:
  - "Blacksmith"
  - "Altar" event allowing players to take one item
- Introduced IsCorridor detection system for dynamic instantiation and removal of corridor events
- Enhance item saving system to persist data across rooms, including inventory, dialogues, and more
- Implement full inventory system
- Add multiple UI elements, animations, and canvas for visual feedback

* fix: add removed line

* feat: Add waiting screen and fix some behaviors (#14)

* merge: Merge menu and develop and fix little issues (#10)

* merge: Merge develop to menu (#9)

* feat: Level move (#7)

* feature: First try to add level move in Unity

* feat: fix Arrow, upgrade door system

* feat: Fix multiple problem

* fix: fix door teleport with disable player public selected

* feat: Addition of traps using sockets (#6)

* feat: Add auto implementation from website of traps

* chore: Add environment variables to UnityProject (#5)

* fix: Remove useless Log that was crashed

* fix(level_move): Replace hard-coded values ​​with variables for better flexibility

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

---------

Co-authored-by: Thomas Lamiable <lamiablethomas@gmail.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* feat: Add Socket to props to send them to back-end (#8)

* feature: First try to add level move in Unity

* feat: fix Arrow, upgrade door system

* feat: Fix multiple problem

* fix: fix door teleport with disable player public selected

* feat: Addition of traps using sockets (#6)

* feat: Add auto implementation from website of traps

* chore: Add environment variables to UnityProject (#5)

* fix: Remove useless Log that was crashed

* feat: Add link to props using sockets

* feat: Add a unique socket system manager

---------

Co-authored-by: Thomas Lamiable <lamiablethomas@gmail.com>

---------

Co-authored-by: Thomas Lamiable <lamiablethomas@gmail.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* fix: Remove duplication of code

* fix: Fix Idle animation

---------

Co-authored-by: Thomas Lamiable <lamiablethomas@gmail.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* revert: Revert changes from EmptyRoom that breaked doors

* feat: V1.0 of WaitingScreen

* fix: Fix the way of sending props and remove the SocketManager from the player

* fix: Remove the Socket when leaving to the menu

* feat: Add the SocketManager to the Menu

* fix: Fix player animation and options text

---------

Co-authored-by: Thomas Lamiable <lamiablethomas@gmail.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* feat: Add trap persistance through rooms (#15)

* feat: Camera Control & Room enlargement (#16)

* feat: Try to update the camera of the user (a bit of a disaster by now)

* fix: Add good tracker Y limit for camera move, synch HUD with camera move

* fix: Fix the camera adapting to the scene

* feat: Get the room bigger

---------

Co-authored-by: Thomlam <lamiablethomas@gmail.com>

* feat: Modify the new room (#17)

* fix: Add a missing pillar

* fix: Crossbow positions (#18)

* fix: Fix the placement of the crossbows

* feat: Add hitboxes to crossbows

* fix: Remove useless traps spawns

* fix: Reorder correctly the crossbow prefabs

* Feature/add traps (#19)

* feature: Update some animations and system for the player, and add new trap

* feat: update EmptyRoom2 for test

---------

Co-authored-by: Guillaume MORET <90462045+AyakorK@users.noreply.github.com>

---------

Co-authored-by: Loule | Louis <35641311+Loule95450@users.noreply.github.com>
Co-authored-by: AyakorK <guillaume.moret@yahoo.com>
Co-authored-by: Guillaume MORET <90462045+AyakorK@users.noreply.github.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
Loule95450 added a commit that referenced this pull request Oct 23, 2024
@AyakorK @Loule95450
@Thomlam @coderabbitai
merge: Develop to Master (#22)
0d7c616 
* Feature/initialization (#1)

* feature: Init repository

* chore: add git ignore

* chore: Upgrade .gitignore

* chore: Remove all ignored files

* chore: Removed all files that are in the .gitignore

---------

Co-authored-by: Thomas Lamiable <lamiablethomas@gmail.com>

* docs: Update README.md

* Feature/global map (#3)

* feature: Add Timelap and player

* fix: fix error with tilemap

* feat: First version of Player Movements

* feat: First version of animation of the player movements

* fix: Update Player prefab to add the animator

* feat: Add collisions + modify player prefab

* chore: Remove useless folder Art

* feature: Add socket connection and linking it to the back-end

* fix(player_movement): Fix call between backend and game

* feature: Ajout de nombreux assets, modifications de la taille, découpage assets

* fix: Global Fixes about the blurring of the components imported

* feat: Add first rooms

* fix: Fix animations and player asset

* feat: Create Third room

* fix: Reduce player's hitbox

* feature: Ajouts des systèmes de pièges, connections et manager des pièges, animations de la crossbow, ajouts des sprites de l'arrow et de ces effets puis damages, changements tags du joueurs et des walls, changement et ajouts des systèmes de vie du joueurs, changements première phase de l'ui et création de celui-ci

* fix: compression des images retirer

* revert: Revert changes on the ground.png.meta

* revert: Revert changes made on the furnitures

* fix: Fix position of map 1 and player collision

* fix: Fix rooms placement

* fix: Fix arrow physics

* feature: Add doors and animations

* feature: add door system end remove multiple commentary

---------

Co-authored-by: AyakorK <guillaume.moret@yahoo.com>
Co-authored-by: Loule | Louis <35641311+Loule95450@users.noreply.github.com>

* Feature/addition of corridors (#4)

* feature: Add Timelap and player

* fix: fix error with tilemap

* feat: First version of Player Movements

* feat: First version of animation of the player movements

* fix: Update Player prefab to add the animator

* feat: Add collisions + modify player prefab

* chore: Remove useless folder Art

* feature: Add socket connection and linking it to the back-end

* fix(player_movement): Fix call between backend and game

* feature: Ajout de nombreux assets, modifications de la taille, découpage assets

* fix: Global Fixes about the blurring of the components imported

* feat: Add first rooms

* fix: Fix animations and player asset

* feat: Create Third room

* fix: Reduce player's hitbox

* feature: Ajouts des systèmes de pièges, connections et manager des pièges, animations de la crossbow, ajouts des sprites de l'arrow et de ces effets puis damages, changements tags du joueurs et des walls, changement et ajouts des systèmes de vie du joueurs, changements première phase de l'ui et création de celui-ci

* fix: compression des images retirer

* revert: Revert changes on the ground.png.meta

* revert: Revert changes made on the furnitures

* fix: Fix position of map 1 and player collision

* fix: Fix rooms placement

* fix: Fix arrow physics

* feature: Add doors and animations

* feat: Addition of corridors

* feature: add door system end remove multiple commentary

---------

Co-authored-by: AyakorK <guillaume.moret@yahoo.com>
Co-authored-by: Loule | Louis <35641311+Loule95450@users.noreply.github.com>

* feature: First try to add level move in Unity

* feat: fix Arrow, upgrade door system

* feat: Fix multiple problem

* fix: fix door teleport with disable player public selected

* feat: Add Menu system, update styling

* feat: Add Dialog system, add multiple coroutine for enable or disable dialog box

* feat: Level move (#7)

* feature: First try to add level move in Unity

* feat: fix Arrow, upgrade door system

* feat: Fix multiple problem

* fix: fix door teleport with disable player public selected

* feat: Addition of traps using sockets (#6)

* feat: Add auto implementation from website of traps

* chore: Add environment variables to UnityProject (#5)

* fix: Remove useless Log that was crashed

* fix(level_move): Replace hard-coded values ​​with variables for better flexibility

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

---------

Co-authored-by: Thomas Lamiable <lamiablethomas@gmail.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* feat: Add and fix prefab, add DevRoom prefab

* fix: fix door

* feat: Add Socket to props to send them to back-end (#8)

* feature: First try to add level move in Unity

* feat: fix Arrow, upgrade door system

* feat: Fix multiple problem

* fix: fix door teleport with disable player public selected

* feat: Addition of traps using sockets (#6)

* feat: Add auto implementation from website of traps

* chore: Add environment variables to UnityProject (#5)

* fix: Remove useless Log that was crashed

* feat: Add link to props using sockets

* feat: Add a unique socket system manager

---------

Co-authored-by: Thomas Lamiable <lamiablethomas@gmail.com>

* hotfix: Delete code duplication

* Feature/menu (#11)

* merge: Merge menu and develop and fix little issues (#10)

* merge: Merge develop to menu (#9)

* feat: Level move (#7)

* feature: First try to add level move in Unity

* feat: fix Arrow, upgrade door system

* feat: Fix multiple problem

* fix: fix door teleport with disable player public selected

* feat: Addition of traps using sockets (#6)

* feat: Add auto implementation from website of traps

* chore: Add environment variables to UnityProject (#5)

* fix: Remove useless Log that was crashed

* fix(level_move): Replace hard-coded values ​​with variables for better flexibility

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

---------

Co-authored-by: Thomas Lamiable <lamiablethomas@gmail.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* feat: Add Socket to props to send them to back-end (#8)

* feature: First try to add level move in Unity

* feat: fix Arrow, upgrade door system

* feat: Fix multiple problem

* fix: fix door teleport with disable player public selected

* feat: Addition of traps using sockets (#6)

* feat: Add auto implementation from website of traps

* chore: Add environment variables to UnityProject (#5)

* fix: Remove useless Log that was crashed

* feat: Add link to props using sockets

* feat: Add a unique socket system manager

---------

Co-authored-by: Thomas Lamiable <lamiablethomas@gmail.com>

---------

Co-authored-by: Thomas Lamiable <lamiablethomas@gmail.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* fix: Remove duplication of code

* fix: Fix Idle animation

---------

Co-authored-by: Thomas Lamiable <lamiablethomas@gmail.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* revert: Revert changes from EmptyRoom that breaked doors

* feat:Some menu option had

* feat: Add pause system, return to menu and restart game, fix OnLoadScene in unity for hard reset player state

* chore: remove commentary for trap manager

---------

Co-authored-by: Guillaume MORET <90462045+AyakorK@users.noreply.github.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
Co-authored-by: AyakorK <guillaume.moret@yahoo.com>

* fix: remove duplicata room

* feat: Add a visual timer prefab (V.1.0) (#12)

Co-authored-by: AyakorK <guillaume.moret@yahoo.com>

* feat: Add dynamic environment interaction system and new events (#13)

- Implement player interaction system with the environment
- Add dynamic room system:
  - Events now added based on room number and corridor-specific stages
  - Dynamic event generation based on the current floor
- New events added:
  - "Blacksmith"
  - "Altar" event allowing players to take one item
- Introduced IsCorridor detection system for dynamic instantiation and removal of corridor events
- Enhance item saving system to persist data across rooms, including inventory, dialogues, and more
- Implement full inventory system
- Add multiple UI elements, animations, and canvas for visual feedback

* fix: add removed line

* feat: Add waiting screen and fix some behaviors (#14)

* merge: Merge menu and develop and fix little issues (#10)

* merge: Merge develop to menu (#9)

* feat: Level move (#7)

* feature: First try to add level move in Unity

* feat: fix Arrow, upgrade door system

* feat: Fix multiple problem

* fix: fix door teleport with disable player public selected

* feat: Addition of traps using sockets (#6)

* feat: Add auto implementation from website of traps

* chore: Add environment variables to UnityProject (#5)

* fix: Remove useless Log that was crashed

* fix(level_move): Replace hard-coded values ​​with variables for better flexibility

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

---------

Co-authored-by: Thomas Lamiable <lamiablethomas@gmail.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* feat: Add Socket to props to send them to back-end (#8)

* feature: First try to add level move in Unity

* feat: fix Arrow, upgrade door system

* feat: Fix multiple problem

* fix: fix door teleport with disable player public selected

* feat: Addition of traps using sockets (#6)

* feat: Add auto implementation from website of traps

* chore: Add environment variables to UnityProject (#5)

* fix: Remove useless Log that was crashed

* feat: Add link to props using sockets

* feat: Add a unique socket system manager

---------

Co-authored-by: Thomas Lamiable <lamiablethomas@gmail.com>

---------

Co-authored-by: Thomas Lamiable <lamiablethomas@gmail.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* fix: Remove duplication of code

* fix: Fix Idle animation

---------

Co-authored-by: Thomas Lamiable <lamiablethomas@gmail.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* revert: Revert changes from EmptyRoom that breaked doors

* feat: V1.0 of WaitingScreen

* fix: Fix the way of sending props and remove the SocketManager from the player

* fix: Remove the Socket when leaving to the menu

* feat: Add the SocketManager to the Menu

* fix: Fix player animation and options text

---------

Co-authored-by: Thomas Lamiable <lamiablethomas@gmail.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* feat: Add trap persistance through rooms (#15)

* feat: Camera Control & Room enlargement (#16)

* feat: Try to update the camera of the user (a bit of a disaster by now)

* fix: Add good tracker Y limit for camera move, synch HUD with camera move

* fix: Fix the camera adapting to the scene

* feat: Get the room bigger

---------

Co-authored-by: Thomlam <lamiablethomas@gmail.com>

* feat: Modify the new room (#17)

* fix: Add a missing pillar

* fix: Crossbow positions (#18)

* fix: Fix the placement of the crossbows

* feat: Add hitboxes to crossbows

* fix: Remove useless traps spawns

* fix: Reorder correctly the crossbow prefabs

* Feature/add traps (#19)

* feature: Update some animations and system for the player, and add new trap

* feat: update EmptyRoom2 for test

---------

Co-authored-by: Guillaume MORET <90462045+AyakorK@users.noreply.github.com>

* fix: Trap management & improvements (#21)

* fix: Enlarge the gridSizeY to match the room and modify the level of the floor to fix traps

* feat: Improve doors and room and traps

* feat: Add walls on first room

* feat: Add bear_trap to trap manager

* hotfix: Remove bear_trap from the EmptyRoom

---------

Co-authored-by: Loule | Louis <35641311+Loule95450@users.noreply.github.com>
Co-authored-by: Thomas Lamiable <lamiablethomas@gmail.com>
Co-authored-by: Thomas Lamiable <86667484+Thomlam@users.noreply.github.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Loule95450 Loule95450 Awaiting requested review from Loule95450

Assignees

@Thomlam Thomlam

@AyakorK AyakorK

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@Thomlam @Loule95450 @AyakorK