Feat/mission-12 #3

Merged

math-pixel merged 12 commits from feat/mission-2 into develop 2026-05-12 14:52:54 +00:00

Conversation 0 Commits 12 Files Changed 24

+1958 -54

math-pixel commented 2026-05-11 16:06:21 +00:00

Owner

Copy Link

Copy Source

todo: clean up, le fichier WORLDS.TSX (demander sa logique métier à l'IA), rename les objet dans three/interaction, mettre les bon dialog (normalement plus besoin de config à challenger mais avec la PR env-manager c'est correct), et bien nommé les sub state de zustand pour le main state intro et remove le dialog message pour ce basé sur le step "locked" de substate du bike

todo: clean up, le fichier WORLDS.TSX (demander sa logique métier à l'IA), rename les objet dans three/interaction, mettre les bon dialog (normalement plus besoin de config à challenger mais avec la PR env-manager c'est correct), et bien nommé les sub state de zustand pour le main state intro et remove le dialog message pour ce basé sur le step "locked" de substate du bike

math-pixel referenced this issue from a commit 2026-05-12 08:17:02 +00:00

Merge pull request #3 from La-Fabrik-Durable/design

math-pixel added 6 commits 2026-05-12 08:17:03 +00:00

update step 41f7b2ad19

update flow 1b7813a5bb

feat-intro 32d644b09d

wip mission 2 f7b968abe7

Merge remote-tracking branch 'origin/develop' into feat/mission-2 ... 91ebea8d99

# Conflicts:
#	package-lock.json
#	package.json
#	src/App.tsx
#	src/components/three/interaction/CentralObject.tsx
#	src/components/three/interaction/VillageoisHelperObject.tsx
#	src/managers/GameStepManager.ts
#	src/stateManager/AudioManager.ts
#	src/world/World.tsx
#	src/world/player/PlayerController.tsx

refactor: move mission flow state into game store 2c3f0db65b

math-pixel force-pushed feat/mission-2 from 836d591617 to 2c3f0db65b 2026-05-12 08:17:03 +00:00 Compare

math-pixel changed title from update step to Feat/mission-12 2026-05-12 08:42:47 +00:00

math-pixel added 4 commits 2026-05-12 13:57:49 +00:00

PR: refactor name eab552a09b

PR: refactor state game 8d197ba26b

merge mission & intro 490f9627cc

fix : audio and data issues 700c088c48

math-pixel added 1 commit 2026-05-12 14:52:02 +00:00

fix : lint ceffedf684

math-pixel added 1 commit 2026-05-12 14:52:19 +00:00

Merge branch 'develop' into feat/mission-2 1cecead474

math-pixel merged commit ae34dc38ed into develop 2026-05-12 14:52:54 +00:00

math-pixel deleted branch feat/mission-2 2026-05-12 14:53:04 +00:00

Sign in to join this conversation.

Reviewers

No Reviewers

Labels

No items

No Label

Milestone

No items

No Milestone

Projects

Clear projects

No project

Assignees

Clear assignees

math-pixel

No Assignees

1 Participants

Notifications

Subscribe

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: math-pixel/La-Fabrik#3