botaccount
/
limboai
mirror of https://github.com/limbonaut/limboai.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'godot42'

This commit is contained in:
Serhii Snitsaruk 2023-10-30 10:26:40 +01:00
parent dca3ba38c0 ecc750bfaf
commit 52a8dc2a0b
11 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/test_builds.yml vendored
View File

@ -20,7 +20,7 @@ on:
# Global settings # Global settings
env: env:
GODOT_TREEISH: 4.1.1-stable GODOT_TREEISH: master
SCONSFLAGS: verbose=yes warnings=extra werror=yes SCONSFLAGS: verbose=yes warnings=extra werror=yes
SCONS_CACHE_LIMIT: 7168 SCONS_CACHE_LIMIT: 7168
DOTNET_NOLOGO: true DOTNET_NOLOGO: true

2
demo/project.godot
View File

@ -12,7 +12,7 @@ config_version=5
config/name="LimboAI Test" config/name="LimboAI Test"
run/main_scene="res://examples/waypoints/example_waypoints.tscn" run/main_scene="res://examples/waypoints/example_waypoints.tscn"
config/features=PackedStringArray("4.1") config/features=PackedStringArray("4.2")
config/icon="res://icon.png" config/icon="res://icon.png"
[gui] [gui]

1
editor/debugger/behavior_tree_data.cpp
View File

@ -11,6 +11,7 @@
#include "behavior_tree_data.h" #include "behavior_tree_data.h"
#include "core/object/script_language.h"
#include "core/templates/list.h" #include "core/templates/list.h"
//// BehaviorTreeData //// BehaviorTreeData

2
editor/debugger/behavior_tree_view.h
View File

@ -20,7 +20,7 @@
#include "core/object/object.h" #include "core/object/object.h"
#include "scene/gui/control.h" #include "scene/gui/control.h"
#include "scene/gui/tree.h" #include "scene/gui/tree.h"
#include "scene/resources/style_box.h" #include "scene/resources/style_box_flat.h"
#include "scene/resources/texture.h" #include "scene/resources/texture.h"
class BehaviorTreeView : public Control { class BehaviorTreeView : public Control {

1
editor/task_tree.cpp
View File

@ -15,6 +15,7 @@
#include "modules/limboai/bt/tasks/composites/bt_probability_selector.h" #include "modules/limboai/bt/tasks/composites/bt_probability_selector.h"
#include "modules/limboai/util/limbo_utility.h" #include "modules/limboai/util/limbo_utility.h"
#include "core/object/script_language.h"
#include "editor/editor_scale.h" #include "editor/editor_scale.h"
//**** TaskTree //**** TaskTree

2
editor/task_tree.h
View File

@ -13,7 +13,7 @@
#include "scene/gui/control.h" #include "scene/gui/control.h"
#include "scene/gui/tree.h" #include "scene/gui/tree.h"
#include "scene/resources/style_box.h" #include "scene/resources/style_box_flat.h"
class TaskTree : public Control { class TaskTree : public Control {
GDCLASS(TaskTree, Control); GDCLASS(TaskTree, Control);

2
tests/test_await_animation.h
View File

@ -29,7 +29,7 @@ namespace TestAwaitAnimation {
TEST_CASE("[SceneTree][LimboAI] BTAwaitAnimation") { TEST_CASE("[SceneTree][LimboAI] BTAwaitAnimation") {
AnimationPlayer *player = memnew(AnimationPlayer); AnimationPlayer *player = memnew(AnimationPlayer);
SceneTree::get_singleton()->get_root()->add_child(player); 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<AnimationLibrary> anim_lib = memnew(AnimationLibrary); Ref<AnimationLibrary> anim_lib = memnew(AnimationLibrary);
Ref<Animation> anim = memnew(Animation); Ref<Animation> anim = memnew(Animation);

2
tests/test_pause_animation.h
View File

@ -27,7 +27,7 @@ namespace TestPauseAnimation {
TEST_CASE("[SceneTree][LimboAI] BTPauseAnimation") { TEST_CASE("[SceneTree][LimboAI] BTPauseAnimation") {
AnimationPlayer *player = memnew(AnimationPlayer); AnimationPlayer *player = memnew(AnimationPlayer);
SceneTree::get_singleton()->get_root()->add_child(player); 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<AnimationLibrary> anim_lib = memnew(AnimationLibrary); Ref<AnimationLibrary> anim_lib = memnew(AnimationLibrary);
Ref<Animation> anim = memnew(Animation); Ref<Animation> anim = memnew(Animation);

2
tests/test_play_animation.h
View File

@ -27,7 +27,7 @@ namespace TestPlayAnimation {
TEST_CASE("[SceneTree][LimboAI] BTPlayAnimation") { TEST_CASE("[SceneTree][LimboAI] BTPlayAnimation") {
AnimationPlayer *player = memnew(AnimationPlayer); AnimationPlayer *player = memnew(AnimationPlayer);
SceneTree::get_singleton()->get_root()->add_child(player); 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<AnimationLibrary> anim_lib = memnew(AnimationLibrary); Ref<AnimationLibrary> anim_lib = memnew(AnimationLibrary);
Ref<Animation> anim = memnew(Animation); Ref<Animation> anim = memnew(Animation);

2
tests/test_stop_animation.h
View File

@ -27,7 +27,7 @@ namespace TestStopAnimation {
TEST_CASE("[SceneTree][LimboAI] BTStopAnimation") { TEST_CASE("[SceneTree][LimboAI] BTStopAnimation") {
AnimationPlayer *player = memnew(AnimationPlayer); AnimationPlayer *player = memnew(AnimationPlayer);
SceneTree::get_singleton()->get_root()->add_child(player); 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<AnimationLibrary> anim_lib = memnew(AnimationLibrary); Ref<AnimationLibrary> anim_lib = memnew(AnimationLibrary);
Ref<Animation> anim = memnew(Animation); Ref<Animation> anim = memnew(Animation);

1
util/limbo_utility.cpp
View File

@ -13,6 +13,7 @@
#include "modules/limboai/bt/tasks/bt_task.h" #include "modules/limboai/bt/tasks/bt_task.h"
#include "core/object/script_language.h"
#include "core/variant/variant.h" #include "core/variant/variant.h"
#include "scene/resources/texture.h" #include "scene/resources/texture.h"