Merge branch 'version-2' into version-2-dev
This commit is contained in:
@@ -67,7 +67,7 @@
|
||||
return this.speedDialsByTab[tabs[this.tabNumber]];
|
||||
},
|
||||
speedDialsByTab() { return {
|
||||
'stats': ['attribute', 'skill'],
|
||||
'stats': ['attribute', 'skill', 'action', 'attack'],
|
||||
'features': ['feature'],
|
||||
'inventory': ['item', 'container'],
|
||||
'spells': ['spellList', 'spell'],
|
||||
|
||||
@@ -108,6 +108,7 @@
|
||||
Tree
|
||||
</v-tab>
|
||||
</v-tabs>
|
||||
<v-spacer />
|
||||
<character-sheet-fab
|
||||
class="character-sheet-fab"
|
||||
:edit-permission="editPermission"
|
||||
|
||||
@@ -1,5 +1,8 @@
|
||||
<template lang="html">
|
||||
<selectable-property-dialog :value="forcedType || type">
|
||||
<selectable-property-dialog
|
||||
:value="forcedType || type"
|
||||
@input="e => type = e"
|
||||
>
|
||||
<creature-property-insert-form
|
||||
:type="forcedType || type"
|
||||
:property-name="getPropertyName(forcedType || type)"
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
<v-toolbar-title slot="toolbar">
|
||||
Add Library Content
|
||||
</v-toolbar-title>
|
||||
<property-selector @select="property => $emit('input', property)" />
|
||||
<property-selector @select="type => $emit('input', type)" />
|
||||
</dialog-base>
|
||||
<div
|
||||
v-show="value"
|
||||
|
||||
Reference in New Issue
Block a user