Update to 4.2-stable

Update godot-cpp to 4.2-stable Update project to 4.2 Mark CCNetworkManager as internal
SilicDev · Aug 15, 2024 · f3a2a27 · f3a2a27
1 parent 82b0f6d
commit f3a2a27
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 13 deletions.
diff --git a/godot-cpp b/godot-cpp
diff --git a/project/demo/Game.tscn b/project/demo/Game.tscn
diff --git a/project/demo/Player.tscn b/project/demo/Player.tscn
@@ -730,9 +730,9 @@ hframes = 4
 vframes = 4
 
 [node name="AnimationPlayer" type="AnimationPlayer" parent="."]
-autoplay = "RESET"
 libraries = {
 "": SubResource("AnimationLibrary_hqs83")
 }
+autoplay = "RESET"
 
 [connection signal="animation_finished" from="AnimationPlayer" to="." method="_on_animation_player_animation_finished"]
diff --git a/project/demo/assets/ui/CrowdControl.theme b/project/demo/assets/ui/CrowdControl.theme
diff --git a/project/project.godot b/project/project.godot
@@ -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.1", "Forward Plus")
+config/features=PackedStringArray("4.2", "Forward Plus")
 config/icon="res://icon.png"
 
 [crowd_control]

diff --git a/src/classes/stream_user.hpp b/src/classes/stream_user.hpp
@@ -15,6 +15,7 @@ class StreamUser : public RefCounted {
 public:
 	GDCLASS(StreamUser, RefCounted)
 
+public:
 	static Ref<StreamUser> make(String p_origin_site, String p_name, String p_display_name, String p_profile_icon_url, PackedStringArray p_roles, PackedStringArray p_subscriptions, String p_origin_id);
 	static Ref<StreamUser> make(String p_name, String p_profile_icon_url, PackedStringArray p_roles);
 	static Ref<StreamUser> make(String p_name, Ref<Texture2D> p_profile_icon);

diff --git a/src/register_types.cpp b/src/register_types.cpp
@@ -25,7 +25,7 @@ void gdextension_initialize(ModuleInitializationLevel p_level) {
 		GDREGISTER_CLASS(CCEffectInstanceParameters);
 		GDREGISTER_CLASS(CCEffectEntries);
 		GDREGISTER_CLASS(CrowdControl);
-		GDREGISTER_ABSTRACT_CLASS(CCNetworkManager);
+		GDREGISTER_INTERNAL_CLASS(CCNetworkManager);
 		if (!Engine::get_singleton()->has_singleton("CrowdControl")) {
 			Engine::get_singleton()->register_singleton("CrowdControl", CrowdControl::get_singleton());
 		}