Skip to content

Commit

Permalink
Update to 4.3-stable
Browse files Browse the repository at this point in the history
Enable usage of proper virtual functions
Update project to 4.3
Update godot-cpp to 4.3-stable
  • Loading branch information
SilicDev committed Aug 15, 2024
1 parent f3a2a27 commit 34ef397
Show file tree
Hide file tree
Showing 24 changed files with 1,376 additions and 1,352 deletions.
1 change: 1 addition & 0 deletions SConstruct
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ env.Append(CPPPATH=["src/"])
sources = Glob("src/*.cpp")
sources.append(Glob('src/util/*.cpp'))
sources.append(Glob('src/classes/*.cpp'))
sources.append(Glob('src/classes/cc_effect/*.cpp'))

# Find gdextension path even if the directory or extension is renamed (e.g. project/addons/example/example.gdextension).
(extension_path,) = glob("project/addons/*/*.gdextension")
Expand Down
2 changes: 1 addition & 1 deletion godot-cpp
Submodule godot-cpp updated 138 files
Binary file modified project/demo/assets/ui/CrowdControl.theme
Binary file not shown.
30 changes: 15 additions & 15 deletions project/demo/effects/effects.tres
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@

[sub_resource type="CCEffectBidWar" id="CCEffectBidWar_x4bmo"]
entry_count = 3
icon = ExtResource("1_5quk0")
id = &"changecolor"
display_name = "Change Color"
description = "Change the player's color."
entry_0/name = "Red"
entry_0/tint = Color(1, 1, 1, 1)
entry_0/id = "changecolor_red"
Expand All @@ -24,6 +20,10 @@ entry_1/id = "changecolor_green"
entry_2/name = "Blue"
entry_2/tint = Color(1, 1, 1, 1)
entry_2/id = "changecolor_blue"
icon = ExtResource("1_5quk0")
id = &"changecolor"
display_name = "Change Color"
description = "Change the player's color."
script = ExtResource("1_mlue8")

[sub_resource type="CCEffect" id="CCEffect_d6xm7"]
Expand All @@ -38,18 +38,18 @@ script = ExtResource("1_uq48j")

[sub_resource type="CCEffectParameters" id="CCEffectParameters_fqfyx"]
parameter_count = 1
parameter_0/name = "Total Coins"
parameter_0/tint = Color(1, 1, 1, 1)
parameter_0/id = "givecoins_totalcoins"
parameter_0/kind = 0
parameter_0/options = PackedStringArray("One", "Two", "Three", "Four", "Five")
morality = 1
icon = ExtResource("1_5quk0")
id = &"givecoins"
display_name = "Give Coins"
description = "Give the player coins."
price = 1
categories = PackedStringArray("Coins")
parameter_0/name = "Total Coins"
parameter_0/tint = Color(1, 1, 1, 1)
parameter_0/id = "givecoins_totalcoins"
parameter_0/kind = 0
parameter_0/options = PackedStringArray("One", "Two", "Three", "Four", "Five")
script = ExtResource("3_y87ju")

[sub_resource type="CCEffectTimed" id="CCEffectTimed_4e1yg"]
Expand All @@ -74,18 +74,18 @@ script = ExtResource("5_bytua")

[sub_resource type="CCEffectParameters" id="CCEffectParameters_2xsdb"]
parameter_count = 1
morality = 2
icon = ExtResource("1_5quk0")
id = &"takecoins"
display_name = "Take Coins"
description = "Take a certain amount of coins away from the player."
price = 1
parameter_0/name = "Quantity"
parameter_0/tint = Color(1, 1, 1, 1)
parameter_0/id = "quantity"
parameter_0/kind = 1
parameter_0/min = 1
parameter_0/max = 99
morality = 2
icon = ExtResource("1_5quk0")
id = &"takecoins"
display_name = "Take Coins"
description = "Take a certain amount of coins away from the player."
price = 1
script = ExtResource("6_gvow0")

[sub_resource type="CCEffect" id="CCEffect_s1y7j"]
Expand Down
2 changes: 1 addition & 1 deletion project/project.godot
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ config_version=5
config/name="CrowdControlDemo"
config/tags=PackedStringArray("addon", "demo")
run/main_scene="res://demo/ui/MainMenu.tscn"
config/features=PackedStringArray("4.2", "Forward Plus")
config/features=PackedStringArray("4.3", "Forward Plus")
config/icon="res://icon.png"

[crowd_control]
Expand Down
2 changes: 1 addition & 1 deletion src/classes/cc_editor_plugin.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include <godot_cpp/classes/label.hpp>
#include <godot_cpp/variant/callable.hpp>

#include "classes/cc_effect.hpp"
#include "classes/cc_effect/cc_effect.hpp"

void CCEditorInspectorPlugin::_create_manifest(Ref<CCEffectEntries> p_entries) {
ERR_FAIL_NULL_EDMSG(p_entries, "No effect entries loaded!");
Expand Down
Loading

0 comments on commit 34ef397

Please sign in to comment.