diff --git a/core/io/multiplayer_api.cpp b/core/io/multiplayer_api.cpp index 00636278477..5503b8d59cc 100644 --- a/core/io/multiplayer_api.cpp +++ b/core/io/multiplayer_api.cpp @@ -800,11 +800,11 @@ void MultiplayerAPI::_bind_methods() { BIND_ENUM_CONSTANT(RPC_MODE_DISABLED); BIND_ENUM_CONSTANT(RPC_MODE_REMOTE); - BIND_ENUM_CONSTANT(RPC_MODE_SYNC); BIND_ENUM_CONSTANT(RPC_MODE_MASTER); BIND_ENUM_CONSTANT(RPC_MODE_PUPPET); - BIND_ENUM_CONSTANT(RPC_MODE_SLAVE); + BIND_ENUM_CONSTANT(RPC_MODE_SLAVE); // deprecated BIND_ENUM_CONSTANT(RPC_MODE_REMOTESYNC); + BIND_ENUM_CONSTANT(RPC_MODE_SYNC); // deprecated BIND_ENUM_CONSTANT(RPC_MODE_MASTERSYNC); BIND_ENUM_CONSTANT(RPC_MODE_PUPPETSYNC); } diff --git a/doc/classes/ProjectSettings.xml b/doc/classes/ProjectSettings.xml index b0d1cf8619b..548d60fe357 100644 --- a/doc/classes/ProjectSettings.xml +++ b/doc/classes/ProjectSettings.xml @@ -157,6 +157,8 @@ + + Scale the boot splash image to the full window length when engine starts (will leave it as default pixel size otherwise). @@ -226,6 +228,8 @@ + + diff --git a/doc/classes/ShaderMaterial.xml b/doc/classes/ShaderMaterial.xml index 5abba9fba96..7491d22479f 100644 --- a/doc/classes/ShaderMaterial.xml +++ b/doc/classes/ShaderMaterial.xml @@ -20,6 +20,22 @@ Returns the current value set for this material of a uniform in the shader. + + + + + + + + + + + + + + + + diff --git a/doc/classes/VisualServer.xml b/doc/classes/VisualServer.xml index afada05bf7a..58b3d33cdbe 100644 --- a/doc/classes/VisualServer.xml +++ b/doc/classes/VisualServer.xml @@ -2185,6 +2185,16 @@ Returns the value of a certain material's parameter. + + + + + + + + + +