Merge branch 'feature/map-refactor' of ssh://gitea.directonline.io:29417/noxious/client into feature/map-refactor
# Conflicts: # src/components/gameMaster/mapEditor/Map.vue # src/components/gameMaster/mapEditor/mapPartials/PlacedMapObjects.vue # src/components/gameMaster/mapEditor/partials/Toolbar.vue # src/components/screens/MapEditor.vue
This commit is contained in:
commit
2d6b1ff1e0
@ -6,6 +6,19 @@
|
||||
<div v-else>
|
||||
<Map v-if="mapEditor.currentMap.value" :key="mapEditor.currentMap.value?.id" />
|
||||
<Toolbar ref="toolbar" @save="save" @clear="clear" @open-maps="mapModal?.open" @open-settings="mapSettingsModal?.open" @open-teleport="teleportModal?.open"/>
|
||||
<Toolbar
|
||||
ref="toolbar"
|
||||
@save="save"
|
||||
@clear="clear"
|
||||
@open-maps="mapModal?.open"
|
||||
@open-settings="mapSettingsModal?.open"
|
||||
@open-teleport-settings="teleportModal?.open"
|
||||
@close-editor="mapEditor.toggleActive"
|
||||
@close-lists="tileList?.close"
|
||||
@closeLists="objectList?.close"
|
||||
@open-tile-list="tileList?.open"
|
||||
@open-map-object-list="objectList?.open"
|
||||
/>
|
||||
<MapList ref="mapModal" @open-create-map="mapSettingsModal?.open" />
|
||||
<TileList />
|
||||
<MapObjectList />
|
||||
@ -34,6 +47,7 @@ import { MapStorage } from '@/storage/storages'
|
||||
import { useGameStore } from '@/stores/gameStore'
|
||||
import { Game, Scene } from 'phavuer'
|
||||
import { ref, useTemplateRef } from 'vue'
|
||||
import teleportModal from '@/components/gameMaster/mapEditor/partials/TeleportModal.vue'
|
||||
|
||||
const mapStorage = new MapStorage()
|
||||
const mapEditor = useMapEditorComposable()
|
||||
|
Loading…
x
Reference in New Issue
Block a user