diff --git a/doc/classes/LightmapGIData.xml b/doc/classes/LightmapGIData.xml index e7454f4ea813c..ce21a6a8bb81a 100644 --- a/doc/classes/LightmapGIData.xml +++ b/doc/classes/LightmapGIData.xml @@ -74,5 +74,7 @@ Shadowmasking is enabled. Directional shadows will be rendered with real-time shadows overlaid on top of the shadowmask texture. This mode makes for smoother shadow transitions when the camera moves fast, at the cost of a potential smearing effect for directional shadows that are up close (due to the real-time shadow being mixed with a low-resolution shadowmask). Objects that only have shadows baked in the shadowmask (and no real-time shadows) will keep their shadows up close. + + diff --git a/modules/interactive_music/audio_stream_interactive.cpp b/modules/interactive_music/audio_stream_interactive.cpp index 71192681f0ff6..02dcf9210ff6a 100644 --- a/modules/interactive_music/audio_stream_interactive.cpp +++ b/modules/interactive_music/audio_stream_interactive.cpp @@ -522,6 +522,8 @@ void AudioStreamInteractive::_bind_methods() { BIND_ENUM_CONSTANT(TRANSITION_TO_TIME_SAME_POSITION); BIND_ENUM_CONSTANT(TRANSITION_TO_TIME_START); + BIND_ENUM_CONSTANT(TRANSITION_TO_TIME_PREVIOUS_POSITION); + BIND_ENUM_CONSTANT(TRANSITION_TO_TIME_MAX); BIND_ENUM_CONSTANT(FADE_DISABLED); BIND_ENUM_CONSTANT(FADE_IN); diff --git a/modules/interactive_music/doc_classes/AudioStreamInteractive.xml b/modules/interactive_music/doc_classes/AudioStreamInteractive.xml index ea95a1a31ecb7..bac62eb8ea7be 100644 --- a/modules/interactive_music/doc_classes/AudioStreamInteractive.xml +++ b/modules/interactive_music/doc_classes/AudioStreamInteractive.xml @@ -199,6 +199,10 @@ Transition to the start of the destination clip. + + + + Do not use fade for the transition. This is useful when transitioning from a clip-end to clip-beginning, and each clip has their begin/end. diff --git a/modules/openxr/action_map/openxr_action.cpp b/modules/openxr/action_map/openxr_action.cpp index 313113ec3379d..1739eeda9a35a 100644 --- a/modules/openxr/action_map/openxr_action.cpp +++ b/modules/openxr/action_map/openxr_action.cpp @@ -50,6 +50,8 @@ void OpenXRAction::_bind_methods() { BIND_ENUM_CONSTANT(OPENXR_ACTION_FLOAT); BIND_ENUM_CONSTANT(OPENXR_ACTION_VECTOR2); BIND_ENUM_CONSTANT(OPENXR_ACTION_POSE); + BIND_ENUM_CONSTANT(OPENXR_ACTION_HAPTIC); + BIND_ENUM_CONSTANT(OPENXR_ACTION_MAX); } Ref OpenXRAction::new_action(const char *p_name, const char *p_localized_name, const ActionType p_action_type, const char *p_toplevel_paths) { diff --git a/modules/openxr/doc_classes/OpenXRAction.xml b/modules/openxr/doc_classes/OpenXRAction.xml index 2a9f255f2f20c..1a43c087639f1 100644 --- a/modules/openxr/doc_classes/OpenXRAction.xml +++ b/modules/openxr/doc_classes/OpenXRAction.xml @@ -34,5 +34,9 @@ + + + + diff --git a/scene/3d/lightmap_gi.cpp b/scene/3d/lightmap_gi.cpp index 438601985d3cc..29b9d86479ef2 100644 --- a/scene/3d/lightmap_gi.cpp +++ b/scene/3d/lightmap_gi.cpp @@ -375,6 +375,7 @@ void LightmapGIData::_bind_methods() { BIND_ENUM_CONSTANT(SHADOWMASK_MODE_NONE); BIND_ENUM_CONSTANT(SHADOWMASK_MODE_REPLACE); BIND_ENUM_CONSTANT(SHADOWMASK_MODE_OVERLAY); + BIND_ENUM_CONSTANT(SHADOWMASK_MODE_ONLY); } LightmapGIData::LightmapGIData() {