Merge remote-tracking branch 'origin/main' into feature/new-design-FE

This commit is contained in:
2024-10-12 21:37:58 +02:00
10 changed files with 544 additions and 127 deletions

View File

@ -5,6 +5,7 @@
<div v-if="!zoneEditorStore.active">
<Game :config="gameConfig" @create="createGame">
<Effects />
<Scene name="main" @preload="preloadScene" @create="createScene">
<div v-if="isLoaded">
<Inventory />
@ -51,6 +52,7 @@ import ZoneEditor from '@/components/gameMaster/zoneEditor/ZoneEditor.vue'
import GmPanel from '@/components/gameMaster/GmPanel.vue'
import Inventory from '@/components/gui/UserPanel.vue'
import { loadAssets } from '@/composables/zoneComposable'
import Effects from '@/components/Effects.vue'
const gameStore = useGameStore()
const zoneEditorStore = useZoneEditorStore()