diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-06-05 06:16:38 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-05 06:16:38 +0200 |
| commit | 0df0a07ab86381c1580a0a38d11ec44c4c9fddf7 (patch) | |
| tree | c07b567b9c2c4f32ae08263aa64de5a9ab82e564 | |
| parent | eaffb88558b6ef2a4c20ad7d1da94e3d1d4c0f4a (diff) | |
| parent | 8d66896a477acc1245fa7f6aded4c5131ce447c2 (diff) | |
Merge pull request #61335 from nathanfranke/configuration-typo
rename 'configuration' to 'replication_config' in MultiplayerSynchronizer
| -rw-r--r-- | doc/classes/MultiplayerSynchronizer.xml | 2 | ||||
| -rw-r--r-- | scene/multiplayer/multiplayer_synchronizer.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/classes/MultiplayerSynchronizer.xml b/doc/classes/MultiplayerSynchronizer.xml index 89ee66a535..ac067791e6 100644 --- a/doc/classes/MultiplayerSynchronizer.xml +++ b/doc/classes/MultiplayerSynchronizer.xml @@ -7,7 +7,7 @@ <tutorials> </tutorials> <members> - <member name="configuration" type="SceneReplicationConfig" setter="set_replication_config" getter="get_replication_config"> + <member name="replication_config" type="SceneReplicationConfig" setter="set_replication_config" getter="get_replication_config"> </member> <member name="replication_interval" type="float" setter="set_replication_interval" getter="get_replication_interval" default="0.0"> </member> diff --git a/scene/multiplayer/multiplayer_synchronizer.cpp b/scene/multiplayer/multiplayer_synchronizer.cpp index 13fd7bc77e..78cec9ee10 100644 --- a/scene/multiplayer/multiplayer_synchronizer.cpp +++ b/scene/multiplayer/multiplayer_synchronizer.cpp @@ -96,7 +96,7 @@ void MultiplayerSynchronizer::_bind_methods() { ClassDB::bind_method(D_METHOD("set_replication_config", "config"), &MultiplayerSynchronizer::set_replication_config); ClassDB::bind_method(D_METHOD("get_replication_config"), &MultiplayerSynchronizer::get_replication_config); - ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "configuration", PROPERTY_HINT_RESOURCE_TYPE, "SceneReplicationConfig"), "set_replication_config", "get_replication_config"); + ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "replication_config", PROPERTY_HINT_RESOURCE_TYPE, "SceneReplicationConfig"), "set_replication_config", "get_replication_config"); } void MultiplayerSynchronizer::_notification(int p_what) { |