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

# 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
This commit is contained in:
Tom Boullay
2026-05-11 17:46:42 +02:00
945 changed files with 26164 additions and 1569 deletions
+2 -2
View File
@@ -1,5 +1,5 @@
import { useGameStore } from "@/stores/gameStore";
import { useMissionFlowStore } from "@/managers/stores/useMissionFlowStore";
export function useActivityCity(): boolean {
return useGameStore((state) => state.activityCity);
return useMissionFlowStore((state) => state.activityCity);
}