From bf91be1ff164a01a4755db3b6ad0659aca404be0 Mon Sep 17 00:00:00 2001 From: Serhii Snitsaruk Date: Sat, 28 Oct 2023 13:07:11 +0200 Subject: [PATCH 1/5] Fix StyleBoxFlat includes --- editor/debugger/behavior_tree_view.h | 2 +- editor/task_tree.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/editor/debugger/behavior_tree_view.h b/editor/debugger/behavior_tree_view.h index e825a5b..dd46032 100644 --- a/editor/debugger/behavior_tree_view.h +++ b/editor/debugger/behavior_tree_view.h @@ -20,7 +20,7 @@ #include "core/object/object.h" #include "scene/gui/control.h" #include "scene/gui/tree.h" -#include "scene/resources/style_box.h" +#include "scene/resources/style_box_flat.h" #include "scene/resources/texture.h" class BehaviorTreeView : public Control { diff --git a/editor/task_tree.h b/editor/task_tree.h index a8f611d..bd44b2f 100644 --- a/editor/task_tree.h +++ b/editor/task_tree.h @@ -13,7 +13,7 @@ #include "scene/gui/control.h" #include "scene/gui/tree.h" -#include "scene/resources/style_box.h" +#include "scene/resources/style_box_flat.h" class TaskTree : public Control { GDCLASS(TaskTree, Control); From f9f930133fe3993d49b156191d35a3e2cd3f9082 Mon Sep 17 00:00:00 2001 From: Serhii Snitsaruk Date: Sat, 28 Oct 2023 13:09:03 +0200 Subject: [PATCH 2/5] Fix Script includes --- editor/debugger/behavior_tree_data.cpp | 1 + editor/task_tree.cpp | 1 + util/limbo_utility.cpp | 1 + 3 files changed, 3 insertions(+) diff --git a/editor/debugger/behavior_tree_data.cpp b/editor/debugger/behavior_tree_data.cpp index 04b79d7..77438b4 100644 --- a/editor/debugger/behavior_tree_data.cpp +++ b/editor/debugger/behavior_tree_data.cpp @@ -11,6 +11,7 @@ #include "behavior_tree_data.h" +#include "core/object/script_language.h" #include "core/templates/list.h" //// BehaviorTreeData diff --git a/editor/task_tree.cpp b/editor/task_tree.cpp index f5ed104..4cbdcb7 100644 --- a/editor/task_tree.cpp +++ b/editor/task_tree.cpp @@ -15,6 +15,7 @@ #include "modules/limboai/bt/tasks/composites/bt_probability_selector.h" #include "modules/limboai/util/limbo_utility.h" +#include "core/object/script_language.h" #include "editor/editor_scale.h" //**** TaskTree diff --git a/util/limbo_utility.cpp b/util/limbo_utility.cpp index 6b0c8fa..bf819be 100644 --- a/util/limbo_utility.cpp +++ b/util/limbo_utility.cpp @@ -13,6 +13,7 @@ #include "modules/limboai/bt/tasks/bt_task.h" +#include "core/object/script_language.h" #include "core/variant/variant.h" #include "scene/resources/texture.h" From 04537d1e96fc2217fb9f82e2ad5ba8b6f7ff2196 Mon Sep 17 00:00:00 2001 From: Serhii Snitsaruk Date: Sat, 28 Oct 2023 13:10:33 +0200 Subject: [PATCH 3/5] Fix setting animation callback mode process --- tests/test_await_animation.h | 2 +- tests/test_pause_animation.h | 2 +- tests/test_play_animation.h | 2 +- tests/test_stop_animation.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/test_await_animation.h b/tests/test_await_animation.h index 17312a9..00831db 100644 --- a/tests/test_await_animation.h +++ b/tests/test_await_animation.h @@ -29,7 +29,7 @@ namespace TestAwaitAnimation { TEST_CASE("[SceneTree][LimboAI] BTAwaitAnimation") { AnimationPlayer *player = memnew(AnimationPlayer); SceneTree::get_singleton()->get_root()->add_child(player); - player->set_process_callback(AnimationPlayer::AnimationProcessCallback::ANIMATION_PROCESS_IDLE); + player->set_callback_mode_process(AnimationMixer::ANIMATION_CALLBACK_MODE_PROCESS_IDLE); Ref anim_lib = memnew(AnimationLibrary); Ref anim = memnew(Animation); diff --git a/tests/test_pause_animation.h b/tests/test_pause_animation.h index a6bc775..41731bf 100644 --- a/tests/test_pause_animation.h +++ b/tests/test_pause_animation.h @@ -27,7 +27,7 @@ namespace TestPauseAnimation { TEST_CASE("[SceneTree][LimboAI] BTPauseAnimation") { AnimationPlayer *player = memnew(AnimationPlayer); SceneTree::get_singleton()->get_root()->add_child(player); - player->set_process_callback(AnimationPlayer::AnimationProcessCallback::ANIMATION_PROCESS_IDLE); + player->set_callback_mode_process(AnimationMixer::ANIMATION_CALLBACK_MODE_PROCESS_IDLE); Ref anim_lib = memnew(AnimationLibrary); Ref anim = memnew(Animation); diff --git a/tests/test_play_animation.h b/tests/test_play_animation.h index 93e38bf..58061d4 100644 --- a/tests/test_play_animation.h +++ b/tests/test_play_animation.h @@ -27,7 +27,7 @@ namespace TestPlayAnimation { TEST_CASE("[SceneTree][LimboAI] BTPlayAnimation") { AnimationPlayer *player = memnew(AnimationPlayer); SceneTree::get_singleton()->get_root()->add_child(player); - player->set_process_callback(AnimationPlayer::AnimationProcessCallback::ANIMATION_PROCESS_IDLE); + player->set_callback_mode_process(AnimationMixer::ANIMATION_CALLBACK_MODE_PROCESS_IDLE); Ref anim_lib = memnew(AnimationLibrary); Ref anim = memnew(Animation); diff --git a/tests/test_stop_animation.h b/tests/test_stop_animation.h index 6778032..ad88477 100644 --- a/tests/test_stop_animation.h +++ b/tests/test_stop_animation.h @@ -27,7 +27,7 @@ namespace TestStopAnimation { TEST_CASE("[SceneTree][LimboAI] BTStopAnimation") { AnimationPlayer *player = memnew(AnimationPlayer); SceneTree::get_singleton()->get_root()->add_child(player); - player->set_process_callback(AnimationPlayer::AnimationProcessCallback::ANIMATION_PROCESS_IDLE); + player->set_callback_mode_process(AnimationMixer::ANIMATION_CALLBACK_MODE_PROCESS_IDLE); Ref anim_lib = memnew(AnimationLibrary); Ref anim = memnew(Animation); From 0ad33e9af64c997d137f50136b6b1b1052f50cd1 Mon Sep 17 00:00:00 2001 From: Serhii Snitsaruk Date: Sat, 28 Oct 2023 13:10:59 +0200 Subject: [PATCH 4/5] Bump demo project version --- demo/project.godot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/demo/project.godot b/demo/project.godot index 61bb6be..f100ae9 100644 --- a/demo/project.godot +++ b/demo/project.godot @@ -12,7 +12,7 @@ config_version=5 config/name="LimboAI Test" run/main_scene="res://examples/waypoints/example_waypoints.tscn" -config/features=PackedStringArray("4.1") +config/features=PackedStringArray("4.2") config/icon="res://icon.png" [gui] From ecc750bfaf9569abe567723fd09353ee9532238b Mon Sep 17 00:00:00 2001 From: Serhii Snitsaruk Date: Sat, 28 Oct 2023 13:12:45 +0200 Subject: [PATCH 5/5] Target godot "master" branch for test builds --- .github/workflows/test_builds.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_builds.yml b/.github/workflows/test_builds.yml index b316038..f8580d0 100644 --- a/.github/workflows/test_builds.yml +++ b/.github/workflows/test_builds.yml @@ -20,7 +20,7 @@ on: # Global settings env: - GODOT_TREEISH: 4.1.1-stable + GODOT_TREEISH: master SCONSFLAGS: verbose=yes warnings=extra werror=yes SCONS_CACHE_LIMIT: 7168 DOTNET_NOLOGO: true