From e481f88001c5dc0aeaa1282d496de62343f87bca Mon Sep 17 00:00:00 2001 From: "K. S. Ernest (iFire) Lee" Date: Mon, 9 Oct 2023 21:16:27 -0700 Subject: [PATCH 1/3] Update Windows workflow to use the official Godot repository --- .github/workflows/windows.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index c2786af..d7f7e96 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -22,8 +22,8 @@ jobs: # Clone Godot - uses: actions/checkout@v2 with: - repository: v-sekai/godot - ref: groups-4.x + repository: godotengine/godot + ref: master # Clone our module under the correct directory - uses: actions/checkout@v2 From d85a4322efe61381fb73d0ca6133e4e9499709e3 Mon Sep 17 00:00:00 2001 From: Kory Postma Date: Mon, 9 Oct 2023 21:27:15 -0500 Subject: [PATCH 2/3] Fixes for latest abstract changes on godot master --- visual_script.cpp | 4 ++++ visual_script.h | 2 ++ 2 files changed, 6 insertions(+) diff --git a/visual_script.cpp b/visual_script.cpp index fac208a..97258c7 100644 --- a/visual_script.cpp +++ b/visual_script.cpp @@ -779,6 +779,10 @@ bool VisualScript::can_instantiate() const { return true; // ScriptServer::is_scripting_enabled(); } +bool VisualScript::is_abstract() const { + return false; +} + StringName VisualScript::get_instance_base_type() const { return base_type; } Ref