Commit Graph

58 Commits

Author SHA1 Message Date
Antoine Papillon
d906c93460 Resolve merge conflicts using incoming branch 2026-03-16 11:32:15 +01:00
Antoine Papillon
e3852c7f60 fix: remove no_frcition due to bad spelling 2026-03-16 10:56:22 +01:00
Antoine Papillon
2dbe21ec62 refactor: initialise int before the loop 2026-03-13 11:16:25 +01:00
Antoine Papillon
ceb4c54b9d fix: unused int in RegisterAllButtons function 2026-03-13 10:58:51 +01:00
Antoine Papillon
44d3ef02a3 fix: presure plate when the head is on it and pick up 2026-03-13 09:49:50 +01:00
7a281dcb6c git : Merge pull request 'feat/DropHead' (#4) from feat/throwingArc into Prototype
Reviewed-on: #4
Reviewed-by: BoxOfPandor <thibault.pouch@crowmate.fr>
Reviewed-by: Pierre1901 <pierre.ryssen@crowmate.fr>
Reviewed-by: clement <clement.augustinowick@crowmate.fr>
2026-03-12 13:19:47 +01:00
timote koenig
a9314979ad fix: unecessary rigid body 2026-03-12 13:13:15 +01:00
timote koenig
1dbc2734f3 fix: remove useless action 2026-03-12 13:00:28 +01:00
timote koenig
67a1717b86 feat: drop head 2026-03-12 10:33:37 +01:00
Antoine Papillon
0fea90a480 fix: Prefabs IndicatorBlock for showing the green or red color 2026-03-11 17:02:17 +01:00
Antoine Papillon
22764e933b fix: remove moving doors without prefabs 2026-03-11 16:52:58 +01:00
Antoine Papillon
b98c72a10d refactor: moving door with prefab 2026-03-11 16:46:23 +01:00
Thibault Pouch
de9ea88cd2 fix: update SlidingDoor to use parent space for slide vector calculations 2026-03-11 15:07:59 +01:00
Thibault Pouch
382e664b90 fix: add MeshCollider component to Button prefab 2026-03-11 11:38:05 +01:00
Thibault Pouch
200209df9a git : Merge branch 'feat/level/create-level-1' into fix/dev-room 2026-03-11 11:37:33 +01:00
Antoine Papillon
fff812bd03 fix: replace mesh collider to sphere collider from the button 2026-03-11 11:29:43 +01:00
Thibault Pouch
ffe6d73a50 fix : all box coliders 2026-03-11 10:59:35 +01:00
Thibault Pouch
303866fa6d chroe : add layer to wall and floor 2026-03-11 10:41:39 +01:00
Thibault Pouch
30085123c2 refactor : simplify the scene 2026-03-11 10:34:24 +01:00
Thibault Pouch
e6bd28ec1c fix : error of history 2026-03-11 09:50:06 +01:00
Thibault Pouch
a7320b5ec6 fix : make all object a boxcolider instead of mesh 2026-03-10 21:18:33 +01:00
Thibault Pouch
fb9e02efd6 refactor: Update prefabs for Door, TileFloor, TileGlass, and TileWall with new components and adjustments 2026-03-10 21:16:49 +01:00
Thibault Pouch
d7474f6d4a chore : move scene to approprate folder and create scenne final 2026-03-10 21:06:16 +01:00
Thibault Pouch
fbdfe808cc feat : Add Level.fbx file for model import settings and configurations 2026-03-10 21:05:41 +01:00
Thibault Pouch
3f69369438 feat : add com.unity.formats.fbx dependency to manifest and packages-lock 2026-03-10 21:03:29 +01:00
Thibault Pouch
4c6c87f0b3 chore : rename file to Level01_Work 2026-03-10 21:02:04 +01:00
timote koenig
94e44ad7af Resolve merge conflicts using incoming branch 2026-03-10 15:26:52 +01:00
timote koenig
8c4c2b372b feat: player movement 2026-03-10 15:10:05 +01:00
Thibault Pouch
b418333d67 feat : add SubtitleSequencePlayer and SubtitleTriggerZone for managing subtitle playback 2026-03-10 14:41:42 +01:00
Thibault Pouch
6dd1c5efb8 feat : add Level01IntroSubtitles script for intro subtitle sequence 2026-03-10 13:57:51 +01:00
Thibault Pouch
4b4066fbcc feat : add door and arch shape configurations to ShapeBuilder 2026-03-10 11:11:35 +01:00
Thibault Pouch
55f71245b5 refactor : add shelf for futur puzzul in room 2 2026-03-10 11:10:14 +01:00
Thibault Pouch
4c6f8f0768 refactor : add sliding door for room 3 2026-03-10 10:34:01 +01:00
Thibault Pouch
c20993a512 refactor : add slinding door and pressure plate for room 1 2026-03-10 10:30:01 +01:00
Thibault Pouch
4a3811f72e refactor : structure for improved readability and maintainability 2026-03-10 10:23:26 +01:00
Thibault Pouch
da530e2083 feat : Add Dev_trans_grey material and its meta file 2026-03-10 09:49:41 +01:00
Thibault Pouch
f8ef2c1c0e feat : Add Level01 scene meta file to project 2026-03-10 09:49:36 +01:00
e07fb7dc4b git Merge pull request 'Feature : Adding the dev room' into Prototype
Reviewed-on: #1
2026-03-10 09:14:26 +01:00
Thibault Pouch
69518ab9a0 feat (prefabs) : add prefab of button, door and pressure plate 2026-03-08 20:30:03 +01:00
Thibault Pouch
e54cd1b318 refactor (DevRoom) : Add sliding door for X and Z 2026-03-08 20:27:12 +01:00
Thibault Pouch
a86c709f7c refactor (DevRoom) : add sliding door 2026-03-08 20:22:19 +01:00
Thibault Pouch
e9ee111bce feat(SlidingDoor): implement sliding door functionality with open/close events 2026-03-08 20:20:24 +01:00
Thibault Pouch
08d14c3ed3 fix(DevRoom): update TestBlock properties and method references in DevRoom scene 2026-03-08 11:28:58 +01:00
Thibault Pouch
cf523f77ec refactor (button) : change the script of the wall button, and ad it in the dev room 2026-03-08 11:27:25 +01:00
Thibault Pouch
ecb2a911f3 feat(DevRoom): add PlayerMovement script and HUD prefab with initial settings 2026-03-06 18:38:13 +01:00
Thibault Pouch
322f8d1986 feat(DevRoom): add HUD prefab and DevRoomHUD script for controls display 2026-03-06 18:37:56 +01:00
Thibault Pouch
959a4988bc chore (DevRoom): change material to floor and presur plate 2026-03-06 18:24:49 +01:00
Thibault Pouch
b568e547d1 chore : Update materials in DevTex to reference new texture asset 2026-03-06 18:24:15 +01:00
Thibault Pouch
10c25d88a4 art (DevTex) : add "DevTex" material and texture 2026-03-06 18:22:18 +01:00
Thibault Pouch
4506dbb08e feat(ProBuilder): Add new settings for ShapeComponent and lightmapping configurations 2026-03-06 18:15:34 +01:00