Merge branch 'develop' into feat/main-feature

2026-04-30 15:48:35 +02:00
parent 44a77a0197 39fbf2333d
commit a87ffac63f
17 changed files with 808 additions and 18 deletions
@@ -12,6 +12,7 @@ import { Environment } from "@/world/Environment";
 import { GameMusic } from "@/world/GameMusic";
 import { Lighting } from "@/world/Lighting";
 import { GameMap } from "@/world/GameMap";
+import { GameStageContent } from "@/world/GameStageContent";
 import { Player } from "@/world/player/Player";
 import { TestMap } from "@/world/debug/TestMap";

@@ -35,6 +36,7 @@ export function World(): React.JSX.Element {
        <>
          <GameMusic />
          <GameMap onOctreeReady={setOctree} />
+          <GameStageContent />
        </>
      ) : (
        <TestMap onOctreeReady={setOctree} />