Commit Graph

92 Commits

Author SHA1 Message Date
Pierre Ryssen
280626bf6b merge feat/level/create-level-1 : keep the most recent 2026-03-30 17:23:31 +02:00
66b8ea1c3f git: Merge pull request 'fix/dev-room' (#5) from fix/dev-room into Prototype
Reviewed-on: #5
Reviewed-by: BoxOfPandor <thibault.pouch@crowmate.fr>
Reviewed-by: clement <clement.augustinowick@crowmate.fr>
2026-03-17 10:49:58 +01:00
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
187c4fbf61 fix: debug cube for sliding door 2026-03-15 20:52:01 +01:00
Thibault Pouch
935b4c089a refactor : modify the box colider for invisible wall 2026-03-13 13:48:15 +01:00
timote koenig
bf80659d7b fix: center head / player 2026-03-13 13:19:35 +01:00
timote koenig
4f19d135df fix: can't interact with head and roof 2026-03-13 13:11:23 +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
Thibault Pouch
7d7b288b4f chore : remove arrow 2026-03-13 10:25:23 +01:00
Thibault Pouch
e1d520e9fb build : remove the build files 2026-03-13 10:17:13 +01:00
Thibault Pouch
efea27a503 build : add build file 2026-03-13 09:56:41 +01:00
Thibault Pouch
4c9436ae74 refactor : add no_frixtion for bottom shelf 2026-03-13 09:54:56 +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
Thibault Pouch
0892ac9de3 refactor : add wall for door 2026-03-13 09:36:36 +01:00
Thibault Pouch
18a12a11a5 refactor : modify the wall 2026-03-13 09:33:46 +01:00
Thibault Pouch
7daba4cb56 Refactor : remake the prefab 2026-03-13 09:31:27 +01:00
timote koenig
46c1094b7f feat: clement image and smaller pedestal 2026-03-13 09:12:53 +01:00
timote koenig
43792c347e feat: Antoine Image 2026-03-12 18:56:22 +01:00
timote koenig
ee621dfc24 feat: end room with Crowmate 2026-03-12 18:46:17 +01:00
timote koenig
09acac00c7 fix: save the scene 2026-03-12 16:57:48 +01:00
timote koenig
e506bce879 fix: strange raction with head, and bigger pressure plate 2026-03-12 16:55:03 +01:00
Thibault Pouch
08b051de1c feat : create prefab of each room 2026-03-12 15:14:48 +01:00
Thibault Pouch
8ed3a97669 chore : remove final scene and rename work scene 2026-03-12 15:04:14 +01:00
Thibault Pouch
4d5af9b60f refactor : modify startup game 2026-03-12 14:51:42 +01:00
Thibault Pouch
66a8ca6e49 refactor : make the player slitly bigger 2026-03-12 14:04:56 +01:00
Thibault Pouch
fb76786cf9 feat : add new player 2026-03-12 13:34:48 +01:00
Thibault Pouch
a28f6287be git : Merge branch 'Prototype' into feat/level/create-level-1 2026-03-12 13:27:55 +01:00
Thibault Pouch
c3c487999d refactor : move room 3 2026-03-12 13:20:56 +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
Thibault Pouch
eee022fa5f refactor : modify the shelf 2026-03-12 10:09:56 +01:00
Thibault Pouch
bf59556985 feat : add text for the code order of button 2026-03-12 09:40:49 +01:00
Thibault Pouch
4593b3714c refactor : add number of each button 2026-03-12 09:36:26 +01:00
Thibault Pouch
530e9e0bd2 feat : add TextMeshPro 2026-03-12 09:36:02 +01:00
Thibault Pouch
47dc0b3886 feat : add subtilte for the room 1 and 2 2026-03-12 09:21:02 +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
e92cbe1f4b refactor : update scene 2026-03-11 14:59:28 +01:00
Thibault Pouch
421df26822 feat : add a pedestal 2026-03-11 14:57:54 +01:00
Thibault Pouch
467dabc2f6 feat : add button and puzzle logic 2026-03-11 14:48:16 +01:00
Thibault Pouch
f4137c8b04 feat: add BigDoor prefab and update references in Level01_Work scene 2026-03-11 14:10:03 +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