Skip to content

Merge fixes #68

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 12, 2025
Merged

Merge fixes #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
245f810
some clarification by renaming
psyinf Feb 5, 2025
1f443a2
isolate fix
psyinf Feb 12, 2025
9c7cdd3
move to working versions
psyinf Feb 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions apps/galaxy/behaviors/MakeDrone.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,9 @@ class MakeDrone : public BehaviorActionNode
auto&& [transform, faction] = view.get<pg::Transform2D, galaxy::Faction>(maker_entity);

auto dot_sprite = game.getResource<pg::Sprite>("::resources/circle_05.png");
const auto& drone_params = galaxy::getFactionConfig(game, faction).droneParams;
const auto& faction_start_params = galaxy::getFactionConfig(game, faction).startParams;
const auto& drone_params = galaxy::getFactionConfig(game, faction.name).droneParams;
const auto& faction_start_params = galaxy::getFactionConfig(game, faction.name).startParams;
const auto& faction_color = galaxy::getFactionConfig(game, faction.name).color;

// create a drone
auto renderState = pg::States{};
Expand Down
4 changes: 2 additions & 2 deletions cmake/deps_cpm.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ CPMAddPackage(
CPMAddPackage(
Name btcpp
GITHUB_REPOSITORY BehaviorTree/BehaviorTree.CPP
GIT_TAG b4bbef6800dca639dcf0316f0a5312c6f10e27ed
GIT_TAG HEAD
SYSTEM TRUE
OPTIONS
"BTCPP_SHARED_LIBS OFF"
Expand Down Expand Up @@ -154,7 +154,7 @@ if(SCRIPTING)
CPMAddPackage(
NAME cparse
GITHUB_REPOSITORY psyinf/cparse
GIT_TAG b98299c7b0e94d1300ab227bead61fdd72fc1ef1
GIT_TAG 87d2f03ea2828908402864a1df4fd61e689b4386
)

CPMAddPackage(
Expand Down
2 changes: 1 addition & 1 deletion cmake/deps_cpm_pg.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ CPMAddPackage(
CPMAddPackage(
NAME soundEngine
GITHUB_REPOSITORY psyinf/soundEngine
GIT_TAG v0.1.2
GIT_TAG v0.1.3
SYSTEM
)
Loading