Merge branch 'godotengine:master' into sky-material-drop-panorama

Author: Critsium-xy

.github/CODEOWNERS

@@ -179,6 +179,8 @@
 /modules/openxr/                              @godotengine/xr
 /modules/openxr/doc_classes/                  @godotengine/xr @godotengine/documentation
 /modules/openxr/editor/                       @godotengine/xr @godotengine/editor
+/modules/visionos_xr/                         @godotengine/xr
+/modules/visionos_xr/doc_classes/             @godotengine/xr @godotengine/documentation
 /modules/webxr/                               @godotengine/xr
 /modules/webxr/doc_classes/                   @godotengine/xr @godotengine/documentation
 

.github/workflows/android_builds.yml

@@ -68,12 +68,20 @@ jobs:
         run: python ./misc/scripts/install_swappy_android.py
 
       - name: Download Perfetto
-        run: python ./misc/scripts/install_perfetto.py
+        shell: sh
+        id: perfetto_sdk
+        run: |
+          if python ./misc/scripts/install_perfetto.py; then
+            echo "PROFILER_ENABLED=perfetto" >> "$GITHUB_OUTPUT"
+          else
+            echo "::warning::Perfetto installation failed, building without Perfetto support."
+            echo "PROFILER_ENABLED=none" >> "$GITHUB_OUTPUT"
+          fi
 
       - name: Compilation
         uses: ./.github/actions/godot-build
         with:
-          scons-flags: ${{ env.SCONS_FLAGS }} ${{ matrix.scons-flags }}
+          scons-flags: ${{ env.SCONS_FLAGS }} ${{ matrix.scons-flags }} profiler=${{ steps.perfetto_sdk.outputs.PROFILER_ENABLED }}
           platform: android
           target: ${{ matrix.target }}
 

.github/workflows/visionos_builds.yml

@@ -0,0 +1,45 @@
+name: 🕶️ visionOS Builds
+on:
+  workflow_call:
+  workflow_dispatch:
+
+# Global Settings
+env:
+  SCONS_FLAGS: >-
+    dev_mode=yes
+    module_text_server_fb_enabled=yes
+    debug_symbols=no
+
+jobs:
+  visionos-template:
+    # From https://docs.github.com/en/actions/how-tos/write-workflows/choose-where-workflows-run/choose-the-runner-for-a-job#choosing-github-hosted-runners
+    runs-on: macos-26
+    name: Template (target=template_release)
+    timeout-minutes: 60
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v6
+        with:
+          submodules: recursive
+
+      - name: Restore Godot build cache
+        uses: ./.github/actions/godot-cache-restore
+        continue-on-error: true
+
+      - name: Setup Python and SCons
+        uses: ./.github/actions/godot-deps
+
+      - name: Compilation (arm64)
+        uses: ./.github/actions/godot-build
+        with:
+          scons-flags: ${{ env.SCONS_FLAGS }}
+          platform: visionos
+          target: template_release
+
+      - name: Save Godot build cache
+        uses: ./.github/actions/godot-cache-save
+        continue-on-error: true
+
+      - name: Upload artifact
+        uses: ./.github/actions/upload-artifact

core/os/keyboard.cpp

@@ -62,18 +62,29 @@ static const _KeyCodeText _keycodes[] = {
 	{Key::PAGEDOWN              ,"PageDown"},
 	{Key::SHIFT                 ,"Shift"},
 	{Key::CTRL                  ,"Ctrl"},
+	// Include all strings for all platforms. The first string
+	// should be the one expected from get_keycode_string().
 #if defined(MACOS_ENABLED)
 	{Key::META                  ,"Command"},
+	{Key::META                  ,"Windows"},
+	{Key::META                  ,"Meta"},
 	{Key::CMD_OR_CTRL           ,"Command"},
 	{Key::ALT                   ,"Option"},
+	{Key::ALT                   ,"Alt"},
 #elif defined(WINDOWS_ENABLED)
 	{Key::META                  ,"Windows"},
+	{Key::META                  ,"Command"},
+	{Key::META                  ,"Meta"},
 	{Key::CMD_OR_CTRL           ,"Ctrl"},
 	{Key::ALT                   ,"Alt"},
+	{Key::ALT                   ,"Option"},
 #else
 	{Key::META                  ,"Meta"},
+	{Key::META                  ,"Windows"},
+	{Key::META                  ,"Command"},
 	{Key::CMD_OR_CTRL           ,"Ctrl"},
 	{Key::ALT                   ,"Alt"},
+	{Key::ALT                   ,"Option"},
 #endif
 	{Key::CAPSLOCK              ,"CapsLock"},
 	{Key::NUMLOCK               ,"NumLock"},

core/templates/hashfuncs.h

@@ -164,7 +164,7 @@ template <typename, typename = std::void_t<>>
 struct has_hash_method : std::false_type {};
 
 template <typename T>
-struct has_hash_method<T, std::void_t<std::is_same<decltype(std::declval<const T>().hash()), uint32_t>>> : std::true_type {};
+struct has_hash_method<T, std::enable_if_t<std::is_same_v<decltype(std::declval<const T>().hash()), uint32_t>>> : std::true_type {};
 
 template <typename T>
 constexpr bool has_hash_method_v = has_hash_method<T>::value;
@@ -207,6 +207,9 @@ struct HashMapHasherDefaultImpl<char *> {
 	static _FORCE_INLINE_ uint32_t hash(const char *p_cstr) { return hash_djb2(p_cstr); }
 };
 
+template <>
+struct HashMapHasherDefaultImpl<const char *> : HashMapHasherDefaultImpl<char *> {};
+
 template <>
 struct HashMapHasherDefaultImpl<wchar_t> {
 	static _FORCE_INLINE_ uint32_t hash(const wchar_t p_wchar) { return hash_fmix32(uint32_t(p_wchar)); }
@@ -285,7 +288,7 @@ template <typename, typename = std::void_t<>>
 struct has_is_same_method : std::false_type {};
 
 template <typename T>
-struct has_is_same_method<T, std::void_t<std::is_same<decltype(std::declval<const T>().is_same(std::declval<const T>())), uint32_t>>> : std::true_type {};
+struct has_is_same_method<T, std::enable_if_t<std::is_same_v<decltype(std::declval<const T>().is_same(std::declval<const T>())), bool>>> : std::true_type {};
 
 template <typename T>
 constexpr bool has_is_same_method_v = has_is_same_method<T>::value;

core/variant/variant_construct.cpp

@@ -261,7 +261,7 @@ void Variant::_unregister_variant_constructors() {
 	}
 }
 
-void Variant::construct(Variant::Type p_type, Variant &p_base, const Variant **p_args, int p_argcount, Callable::CallError &r_error) {
+void Variant::construct(Variant::Type p_type, Variant &r_base, const Variant **p_args, int p_argcount, Callable::CallError &r_error) {
 	ERR_FAIL_INDEX(p_type, Variant::VARIANT_MAX);
 	uint32_t s = construct_data[p_type].size();
 	for (uint32_t i = 0; i < s; i++) {
@@ -281,7 +281,7 @@ void Variant::construct(Variant::Type p_type, Variant &p_base, const Variant **p
 			continue;
 		}
 
-		construct_data[p_type][i].construct(p_base, p_args, r_error);
+		construct_data[p_type][i].construct(r_base, p_args, r_error);
 		return;
 	}
 

doc/class.xsd

@@ -154,6 +154,8 @@
 												<xs:attribute type="xs:byte" name="index" />
 												<xs:attribute type="xs:string" name="name" />
 												<xs:attribute type="xs:string" name="type" />
+												<xs:attribute type="xs:string" name="enum" use="optional" />
+												<xs:attribute type="xs:boolean" name="is_bitfield" use="optional" />
 												<xs:attribute type="xs:string" name="keywords" use="optional" />
 											</xs:complexType>
 										</xs:element>

doc/classes/BaseButton.xml

@@ -34,6 +34,13 @@
 				Returns [code]true[/code] if the mouse has entered the button and has not left it yet.
 			</description>
 		</method>
+		<method name="press">
+			<return type="void" />
+			<description>
+				Presses the button. This causes the corresponding virtual method to be called and the corresponding signal to be emitted, depending on [member toggle_mode]. If [member disabled] is [code]true[/code], nothing happens.
+				[b]Note:[/b] This method does not change the visual state of the button and does not grab focus to the button.
+			</description>
+		</method>
 		<method name="set_pressed_no_signal">
 			<return type="void" />
 			<param index="0" name="pressed" type="bool" />

doc/classes/DisplayServer.xml

@@ -1791,9 +1791,8 @@
 		<method name="screen_get_max_scale" qualifiers="const">
 			<return type="float" />
 			<description>
-				Returns the greatest scale factor of all screens.
-				[b]Note:[/b] On macOS returned value is [code]2.0[/code] if there is at least one hiDPI (Retina) screen in the system, and [code]1.0[/code] in all other cases.
-				[b]Note:[/b] This method is implemented only on macOS.
+				Returns the greatest scale factor of all screens. See also [method screen_get_scale].
+				[b]Note:[/b] On macOS, the returned value is [code]2.0[/code] if there is at least one hiDPI (Retina) screen in the system, and [code]1.0[/code] in all other cases.
 			</description>
 		</method>
 		<method name="screen_get_orientation" qualifiers="const">
@@ -1850,11 +1849,11 @@
 			<return type="float" />
 			<param index="0" name="screen" type="int" default="-1" />
 			<description>
-				Returns the scale factor of the specified screen by index. Returns [code]1.0[/code] if [param screen] is invalid.
+				Returns the scale factor of the specified screen by index. Returns [code]1.0[/code] if [param screen] is invalid. See also [method screen_get_max_scale].
 				[b]Note:[/b] One of the following constants can be used as [param screen]: [constant SCREEN_OF_MAIN_WINDOW], [constant SCREEN_PRIMARY], [constant SCREEN_WITH_MOUSE_FOCUS], or [constant SCREEN_WITH_KEYBOARD_FOCUS].
 				[b]Note:[/b] On macOS, the returned value is [code]2.0[/code] for hiDPI (Retina) screens, and [code]1.0[/code] for all other cases.
 				[b]Note:[/b] On Linux (Wayland), the returned value is accurate only when [param screen] is [constant SCREEN_OF_MAIN_WINDOW]. Due to API limitations, passing a direct index will return a rounded-up integer, if the screen has a fractional scale (e.g. [code]1.25[/code] would get rounded up to [code]2.0[/code]).
-				[b]Note:[/b] This method is implemented on Android, iOS, Web, macOS, and Linux (Wayland). On other platforms, this method always returns [code]1.0[/code].
+				[b]Note:[/b] This method is implemented on Android, iOS, Web, macOS, Linux, and Windows. On other platforms, this method always returns [code]1.0[/code].
 			</description>
 		</method>
 		<method name="screen_get_size" qualifiers="const">

doc/classes/HeightMapShape3D.xml

@@ -6,7 +6,7 @@
 	<description>
 		A 3D heightmap shape, intended for use in physics to provide a shape for a [CollisionShape3D]. This type is most commonly used for terrain with vertices placed in a fixed-width grid.
 		The heightmap is represented as a 2D grid of height values, which represent the position of grid points on the Y axis. Grid points are spaced 1 unit apart on the X and Z axes, and the grid is centered on the origin of the [CollisionShape3D] node. Internally, each grid square is divided into two triangles.
-		Due to the nature of the heightmap, it cannot be used to model overhangs or caves, which would require multiple vertices at the same vertical location. Holes can be punched through the collision by assigning [constant @GDScript.NAN] to the height of the desired vertices (this is supported in both GodotPhysics3D and Jolt Physics). You could then insert meshes with their own separate collision to provide overhangs, caves, and so on.
+		Due to the nature of the heightmap, it cannot be used to model overhangs or caves, which would require multiple vertices at the same vertical location. Holes can be punched through the collision by assigning [constant @GDScript.NAN] to the height of the desired vertices. You could then insert meshes with their own separate collision to provide overhangs, caves, and so on.
 		[b]Performance:[/b] [HeightMapShape3D] is faster to check collisions against than [ConcavePolygonShape3D], but it is significantly slower than primitive shapes like [BoxShape3D].
 		A heightmap collision shape can also be built by using an [Image] reference:
 		[codeblocks]