noxious/client
6
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into feature/#321

Browse Source
This commit is contained in:
Colin Kallemein
2025-02-07 19:59:58 +01:00
parent 8133bd02df 6ba4c1b843
commit b35794d6d3
8 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/gameMaster/assetManager/partials/mapObject/MapObjectList.vue
View File

@ -49,7 +49,7 @@ const handleFileUpload = (e: Event) => {
if (!files) return
gameStore.connection?.emit('gm:mapObject:upload', files, (response: boolean) => {
if (!response) {
if (config.development) console.error('Failed to upload object')
if (config.environment === 'development') console.error('Failed to upload map object')
return
}

2
src/components/gameMaster/assetManager/partials/sprite/SpriteList.vue
View File

@ -42,7 +42,7 @@ const elementToScroll = ref()
function newButtonClickHandler() {
gameStore.connection?.emit('gm:sprite:create', {}, (response: boolean) => {
if (!response) {
if (config.development) console.error('Failed to create new sprite')
if (config.environment === 'development') console.error('Failed to create new sprite')
return
}

2
src/components/gameMaster/assetManager/partials/tile/TileList.vue
View File

@ -49,7 +49,7 @@ const handleFileUpload = (e: Event) => {
if (!files) return
gameStore.connection?.emit('gm:tile:upload', files, (response: boolean) => {
if (!response) {
if (config.development) console.error('Failed to upload tile')
if (config.environment === 'development') console.error('Failed to upload tile')
return
}

4
src/components/gameMaster/mapEditor/partials/SelectedPlacedMapObject.vue
View File

@ -26,11 +26,11 @@
</div>
<div class="form-field-half">
<label for="originX">Origin X</label>
<input class="input-field" v-model="mapObjectOriginX" name="originX" id="originX" type="number" min="0.0" step="0.1" />
<input class="input-field" v-model="mapObjectOriginX" name="originX" id="originX" type="number" min="0.0" step="0.01" />
</div>
<div class="form-field-half">
<label for="originY">Origin Y</label>
<input class="input-field" v-model="mapObjectOriginY" name="originY" id="originY" type="number" min="0.0" step="0.1" />
<input class="input-field" v-model="mapObjectOriginY" name="originY" id="originY" type="number" min="0.0" step="0.01" />
</div>
</div>
<button class="btn-cyan px-4 py-1.5 min-w-24" @click="handleUpdate">Save</button>