Skip to content

Feature/menu#11

Merged
AyakorK merged 7 commits intodevelopfrom
feature/menu
Oct 21, 2024
Merged

Feature/menu#11
AyakorK merged 7 commits intodevelopfrom
feature/menu

Conversation

@Thomlam
Copy link
Copy Markdown
Contributor

@Thomlam Thomlam commented Oct 21, 2024

Summary by CodeRabbit

Notes de version

  • Nouvelles fonctionnalités

    • Ajout d'un menu de pause avec des boutons pour "Reprendre" et "Options".
    • Introduction d'un système de suivi de jeu (GameTracker) pour améliorer la gestion des états de jeu.
  • Modifications

    • Mise à jour des animations pour simplifier les transitions entre les états de mouvement.
    • Renommage et ajustement des propriétés de plusieurs objets dans les scènes pour améliorer la clarté et la fonctionnalité.
  • Corrections de bugs

    • Ajustements des composants de collision pour améliorer l'interaction dans le jeu.

AyakorK and others added 6 commits October 20, 2024 14:25
* 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>
@Thomlam Thomlam self-assigned this Oct 21, 2024
@coderabbitai
Copy link
Copy Markdown
Contributor

coderabbitai Bot commented Oct 21, 2024

Caution

Review failed

The pull request is closed.

Walkthrough

Les modifications apportées dans cette demande de tirage concernent principalement des fichiers d'animation et de prefab dans un projet Unity. L'animation Idle.anim a été mise à jour pour supprimer toutes les entrées d'événements, et le fichier de métadonnées associé a également été modifié pour refléter un nouveau GUID. Des changements significatifs ont été effectués dans le contrôleur d'animateur PlayerMovementAnimatorController.controller, y compris des transitions et des états d'animation. De nouveaux prefabs pour GameTracker et un menu de pause ont été introduits, tandis que plusieurs scènes ont été mises à jour pour intégrer ces nouveaux éléments.

Changes

Fichier Résumé des changements
Assets/Animations/Idle.anim Suppression de toutes les entrées d'événements de m_Events, qui est maintenant un tableau vide.
Assets/Animations/Idle.anim.meta Mise à jour du guid de 35d46c531904e4f318de4b74f3406e3c à 12864ee0eccb6402590333ee01067028.
Assets/PlayerMovementAnimatorController.controller Modifications des transitions et des états d'animation, y compris des changements de m_ConditionMode, de m_EventTreshold, et ajout de nouveaux états comme Walk_left, Walk_right, Walk_back, et Walk_front.
Assets/Prefabs/GameSystem.meta Création d'un nouveau fichier de métadonnées pour le prefab GameSystem, avec un guid et un format de fichier version 2.
Assets/Prefabs/GameSystem/GameTracker.prefab Ajout du prefab GameTracker avec des composants Transform et MonoBehaviour.
Assets/Prefabs/GameSystem/GameTracker.prefab.meta Création d'un fichier de métadonnées pour le prefab GameTracker.
Assets/Prefabs/RoomSystem/Corridor/CorridorX7.prefab Modifications des propriétés des GameObjects, y compris des ajustements de transformation et des renames.
Assets/Prefabs/UI/Pause.prefab Introduction d'un nouveau prefab pour le menu de pause avec plusieurs éléments UI.
Assets/Prefabs/UI/Pause.prefab.meta Création d'un fichier de métadonnées pour le prefab Pause.
Assets/Scenes/DevRoom.unity Ajout d'un nouveau GameObject GameTracker avec des propriétés définies.
Assets/Scenes/EmptyRoom_2.unity Ajout de nouveaux GameObjects comme EventSystem, PauseMenu, et GameTracker, avec des modifications de propriétés.
Assets/Scripts/UI/GameOverManager.cs Ajout d'un nouveau fichier de script pour gérer la logique de fin de jeu, avec des méthodes vides.
Assets/Scripts/UI/GameOverManager.cs.meta Création d'un fichier de métadonnées pour GameOverManager.cs.
Assets/Scripts/UI/MainMenu.cs Modification mineure dans la méthode StartRoom pour ajouter une ligne vide.
Assets/Scripts/UI/PauseMenu.cs Création d'un nouveau fichier de script pour gérer la fonctionnalité de pause du jeu.
Assets/Scripts/UI/PauseMenu.cs.meta Création d'un fichier de métadonnées pour PauseMenu.cs.

Possibly related PRs

  • feat: Add Socket to props to send them to back-end #8 : Les changements dans Assets/Prefabs/Player.prefab et Assets/Prefabs/RoomSystem/Corridor/CorridorX7.prefab impliquent des modifications des structures de prefab, qui pourraient être liées à la gestion des animations et des événements dans les changements d'animation du PR principal. L'ajout de nouveaux composants MonoBehaviour suggère une amélioration de la fonctionnalité qui pourrait interagir avec le système d'animation.

Poem

Dans le jardin des animations,
Les événements ont pris leur vol,
Un GameTracker pour l'action,
Pause et jeu, un doux contrôle.
Avec des états qui dansent en rond,
Unity s'éveille, un monde en bond! 🐇✨


Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

@Thomlam Thomlam requested a review from AyakorK October 21, 2024 09:04
@AyakorK AyakorK merged commit 272cedd into develop Oct 21, 2024
@AyakorK AyakorK deleted the feature/menu branch October 21, 2024 09:09
Thomlam added a commit that referenced this pull request Oct 23, 2024
* 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
* 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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants