diff --git a/.gitea/workflows/main.yaml b/.gitea/workflows/main.yaml index 0cb54916..67665038 100644 --- a/.gitea/workflows/main.yaml +++ b/.gitea/workflows/main.yaml @@ -156,6 +156,11 @@ jobs: - name: Checkout with LFS uses: https://git.game-dev.space/minimata/checkout-with-lfs.git@main + - name: Remove problematic addons + run: | + rm -rf ${{ gitea.workspace }}/addons/gdUnit4 + rm -rf ${{ gitea.workspace }}/addons/rider-plugin + - name: Setup Godot id: setup-godot uses: https://git.game-dev.space/minimata/setup-godot.git@main @@ -163,10 +168,6 @@ jobs: godot-version: ${GODOT_VERSION} dotnet-version: ${DOTNET_VERSION} - - name: Remove GDUnit addon - run: | - rm -rf ${{ gitea.workspace }}/addons/gdUnit4 - - name: Build Windows run: | mkdir -v -p build/windows @@ -178,7 +179,7 @@ jobs: uses: actions/upload-artifact@v3-node20 with: name: Windows build - path: ${{ github.workspace }}/Windows.zip + path: ${{ github.workspace }}/build/windows # - name: Setup Butler # shell: bash # env: diff --git a/addons/forge/nodes/ForgeAttributeSet.cs b/addons/forge/nodes/ForgeAttributeSet.cs index c021ed3d..84fc90c1 100644 --- a/addons/forge/nodes/ForgeAttributeSet.cs +++ b/addons/forge/nodes/ForgeAttributeSet.cs @@ -62,7 +62,6 @@ public partial class ForgeAttributeSet : Node string name = prop.Name; if (InitialAttributeValues.TryGetValue(name, out AttributeValues? value)) { - if (value is null) continue; //temp SetAttributeValue("SetAttributeBaseValue", instance, prop, value.Default); SetAttributeValue("SetAttributeMinValue", instance, prop, value.Min); SetAttributeValue("SetAttributeMaxValue", instance, prop, value.Max); diff --git a/forge/abilities/ForgeUiAbilityBehaviour.cs.uid b/forge/abilities/ForgeUiAbilityBehaviour.cs.uid new file mode 100644 index 00000000..452fb621 --- /dev/null +++ b/forge/abilities/ForgeUiAbilityBehaviour.cs.uid @@ -0,0 +1 @@ +uid://c411ne7juqsnv diff --git a/menus/scenes/components/SelectedAbility.cs b/menus/scenes/components/SelectedAbility.cs index 7ef513af..ededa950 100644 --- a/menus/scenes/components/SelectedAbility.cs +++ b/menus/scenes/components/SelectedAbility.cs @@ -41,8 +41,8 @@ public partial class SelectedAbility : Control public void AbilityUpdated() { - var icon = _icon ?? GetNode("%Icon"); - var title = _title ?? GetNode