main #9

Merged
minimata merged 8 commits from main into release/polylan-05-26 2026-05-17 11:01:58 +00:00
4 changed files with 9 additions and 8 deletions
Showing only changes of commit b2ab80c54c - Show all commits

View File

@@ -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:

View File

@@ -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);

View File

@@ -0,0 +1 @@
uid://c411ne7juqsnv

View File

@@ -41,8 +41,8 @@ public partial class SelectedAbility : Control
public void AbilityUpdated()
{
var icon = _icon ?? GetNode<TextureRect>("%Icon");
var title = _title ?? GetNode<Label>("%Title");
var icon = _icon ?? GetNode<TextureRect>("HBoxContainer/Icon");
var title = _title ?? GetNode<Label>("HBoxContainer/Title");
if (icon == null || title == null) return;
if (_ability == null)
{