Skip to content

Commit cbcb0d9

Browse files
samuelvenablesamuelvenable
authored
Merge branch 'master' into patch-2
2 parents d16c76d + d93bf62 commit cbcb0d9

68 files changed

Lines changed: 2130 additions & 1352 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/CODEOWNERS‎

Lines changed: 1 addition & 255 deletions
Original file line numberDiff line numberDiff line change
@@ -2,258 +2,4 @@
22
# Each line is a file pattern followed by one or more owners.
33
# Owners can be @users, @org/teams or emails.
44

5-
# Core
6-
7-
/core/ @godotengine/core
8-
/core/crypto/ @godotengine/network
9-
/core/debugger/ @godotengine/debugger
10-
/core/extension/ @godotengine/gdextension
11-
/core/input/ @godotengine/input
12-
13-
# Doc
14-
15-
/doc/ @godotengine/documentation
16-
17-
# Drivers
18-
19-
## Audio
20-
/drivers/alsa/ @godotengine/audio
21-
/drivers/alsamidi/ @godotengine/audio
22-
/drivers/coreaudio/ @godotengine/audio
23-
/drivers/coremidi/ @godotengine/audio
24-
/drivers/pulseaudio/ @godotengine/audio
25-
/drivers/wasapi/ @godotengine/audio
26-
/drivers/winmidi/ @godotengine/audio
27-
/drivers/xaudio2/ @godotengine/audio
28-
29-
## Rendering
30-
/drivers/d3d12/ @godotengine/rendering
31-
/drivers/dummy/ @godotengine/rendering
32-
/drivers/egl/ @godotengine/rendering
33-
/drivers/gles3/ @godotengine/rendering
34-
/drivers/metal/ @godotengine/rendering
35-
/drivers/spirv-reflect/ @godotengine/rendering
36-
/drivers/vulkan/ @godotengine/rendering
37-
38-
## OS
39-
/drivers/unix/ @godotengine/linux-bsd
40-
/drivers/windows/ @godotengine/windows
41-
42-
## Misc
43-
/drivers/png/ @godotengine/import
44-
45-
# Editor
46-
47-
/editor/ @godotengine/docks
48-
/editor/script/ @godotengine/script-editor
49-
/editor/shader/ @godotengine/script-editor @godotengine/shaders
50-
/editor/animation/ @godotengine/animation
51-
/editor/audio/ @godotengine/audio
52-
/editor/debugger/ @godotengine/debugger
53-
/editor/doc/ @godotengine/documentation
54-
/editor/docks/ @godotengine/docks
55-
/editor/gui/ @godotengine/usability @godotengine/gui-nodes
56-
/editor/icons/ @godotengine/usability
57-
/editor/import/ @godotengine/import
58-
/editor/inspector/ @godotengine/docks
59-
/editor/scene/2d/ @godotengine/2d-editor
60-
/editor/scene/2d/physics @godotengine/2d-editor @godotengine/physics
61-
/editor/scene/3d/ @godotengine/3d-editor
62-
/editor/scene/3d/physics @godotengine/3d-editor @godotengine/physics
63-
/editor/scene/gui/ @godotengine/gui-nodes
64-
/editor/themes/ @godotengine/usability @godotengine/gui-nodes
65-
/editor/translations/ @godotengine/usability
66-
67-
# Main
68-
69-
/main/ @godotengine/core
70-
71-
# Misc
72-
73-
/misc/ @godotengine/buildsystem
74-
/misc/extension_api_validation/ @godotengine/gdextension @godotengine/dotnet
75-
76-
# Modules
77-
78-
## Audio (+ video)
79-
/modules/interactive_music/ @godotengine/audio
80-
/modules/interactive_music/doc_classes/ @godotengine/audio @godotengine/documentation
81-
/modules/minimp3/ @godotengine/audio
82-
/modules/minimp3/doc_classes/ @godotengine/audio @godotengine/documentation
83-
/modules/ogg/ @godotengine/audio
84-
/modules/ogg/doc_classes/ @godotengine/audio @godotengine/documentation
85-
/modules/theora/ @godotengine/audio
86-
/modules/theora/doc_classes/ @godotengine/audio @godotengine/documentation
87-
/modules/vorbis/ @godotengine/audio
88-
/modules/vorbis/doc_classes/ @godotengine/audio @godotengine/documentation
89-
90-
## Import
91-
/modules/astcenc/ @godotengine/import
92-
/modules/basis_universal/ @godotengine/import
93-
/modules/bcdec/ @godotengine/import
94-
/modules/betsy/ @godotengine/import
95-
/modules/bmp/ @godotengine/import
96-
/modules/cvtt/ @godotengine/import
97-
/modules/dds/ @godotengine/import
98-
/modules/etcpak/ @godotengine/import
99-
/modules/fbx/ @godotengine/import
100-
/modules/fbx/doc_classes/ @godotengine/import @godotengine/documentation
101-
/modules/gltf/ @godotengine/import
102-
/modules/gltf/doc_classes/ @godotengine/import @godotengine/documentation
103-
/modules/gltf/tests/ @godotengine/import @godotengine/tests
104-
/modules/hdr/ @godotengine/import
105-
/modules/jpg/ @godotengine/import
106-
/modules/ktx/ @godotengine/import
107-
/modules/squish/ @godotengine/import
108-
/modules/svg/ @godotengine/import
109-
/modules/tga/ @godotengine/import
110-
/modules/tinyexr/ @godotengine/import
111-
/modules/webp/ @godotengine/import
112-
113-
## Network
114-
/modules/enet/ @godotengine/network
115-
/modules/enet/doc_classes/ @godotengine/network @godotengine/documentation
116-
/modules/mbedtls/ @godotengine/network
117-
/modules/mbedtls/tests/ @godotengine/network @godotengine/tests
118-
/modules/multiplayer/ @godotengine/network
119-
/modules/multiplayer/doc_classes/ @godotengine/network @godotengine/documentation
120-
/modules/multiplayer/tests/ @godotengine/network @godotengine/tests
121-
/modules/upnp/ @godotengine/network
122-
/modules/upnp/doc_classes/ @godotengine/network @godotengine/documentation
123-
/modules/webrtc/ @godotengine/network
124-
/modules/webrtc/doc_classes/ @godotengine/network @godotengine/documentation
125-
/modules/websocket/ @godotengine/network
126-
/modules/websocket/doc_classes/ @godotengine/network @godotengine/documentation
127-
128-
## Physics
129-
/modules/godot_physics_2d/ @godotengine/physics
130-
/modules/godot_physics_3d/ @godotengine/physics
131-
/modules/jolt_physics/ @godotengine/physics
132-
133-
## Rendering
134-
/modules/glslang/ @godotengine/rendering
135-
/modules/lightmapper_rd/ @godotengine/rendering
136-
/modules/meshoptimizer/ @godotengine/rendering
137-
/modules/raycast/ @godotengine/rendering
138-
/modules/vhacd/ @godotengine/rendering
139-
/modules/xatlas_unwrap/ @godotengine/rendering
140-
141-
## Scripting
142-
/modules/gdscript/ @godotengine/gdscript
143-
/modules/gdscript/doc_classes/ @godotengine/gdscript @godotengine/documentation
144-
/modules/gdscript/icons/ @godotengine/gdscript @godotengine/usability
145-
/modules/gdscript/tests/ @godotengine/gdscript @godotengine/tests
146-
/modules/jsonrpc/ @godotengine/gdscript @godotengine/network
147-
/modules/jsonrpc/tests/ @godotengine/gdscript @godotengine/network @godotengine/tests
148-
/modules/mono/ @godotengine/dotnet
149-
/modules/mono/doc_classes/ @godotengine/dotnet @godotengine/documentation
150-
/modules/mono/icons/ @godotengine/dotnet @godotengine/usability
151-
152-
## Text
153-
/modules/freetype/ @godotengine/buildsystem
154-
/modules/msdfgen/ @godotengine/buildsystem
155-
/modules/text_server_adv/ @godotengine/gui-nodes
156-
/modules/text_server_adv/doc_classes/ @godotengine/gui-nodes @godotengine/documentation
157-
/modules/text_server_fb/ @godotengine/gui-nodes
158-
/modules/text_server_fb/doc_classes/ @godotengine/gui-nodes @godotengine/documentation
159-
160-
## XR
161-
/modules/camera/ @godotengine/xr
162-
/modules/mobile_vr/ @godotengine/xr
163-
/modules/mobile_vr/doc_classes/ @godotengine/xr @godotengine/documentation
164-
/modules/openxr/ @godotengine/xr
165-
/modules/openxr/doc_classes/ @godotengine/xr @godotengine/documentation
166-
/modules/webxr/ @godotengine/xr
167-
/modules/webxr/doc_classes/ @godotengine/xr @godotengine/documentation
168-
169-
## Misc
170-
/modules/csg/ @godotengine/3d-nodes
171-
/modules/csg/doc_classes/ @godotengine/3d-nodes @godotengine/documentation
172-
/modules/csg/icons/ @godotengine/3d-nodes @godotengine/usability
173-
/modules/gridmap/ @godotengine/3d-nodes
174-
/modules/gridmap/doc_classes/ @godotengine/3d-nodes @godotengine/documentation
175-
/modules/gridmap/icons/ @godotengine/3d-nodes @godotengine/usability
176-
/modules/navigation_2d/ @godotengine/navigation
177-
/modules/navigation_3d/ @godotengine/navigation
178-
/modules/noise/ @godotengine/core
179-
/modules/noise/doc_classes/ @godotengine/core @godotengine/documentation
180-
/modules/noise/icons/ @godotengine/core @godotengine/usability
181-
/modules/noise/tests/ @godotengine/core @godotengine/tests
182-
/modules/regex/ @godotengine/core
183-
/modules/regex/doc_classes/ @godotengine/core @godotengine/documentation
184-
/modules/regex/icons/ @godotengine/core @godotengine/usability
185-
/modules/regex/tests/ @godotengine/core @godotengine/tests
186-
/modules/zip/ @godotengine/core
187-
/modules/zip/doc_classes/ @godotengine/core @godotengine/documentation
188-
/modules/zip/tests @godotengine/core @godotengine/tests
189-
190-
# Platform
191-
192-
/platform/android/ @godotengine/android
193-
/platform/android/doc_classes/ @godotengine/android @godotengine/documentation
194-
/platform/ios/ @godotengine/ios
195-
/platform/ios/doc_classes/ @godotengine/ios @godotengine/documentation
196-
/platform/linuxbsd/ @godotengine/linux-bsd
197-
/platform/linuxbsd/doc_classes/ @godotengine/linux-bsd @godotengine/documentation
198-
/platform/macos/ @godotengine/macos
199-
/platform/macos/doc_classes/ @godotengine/macos @godotengine/documentation
200-
/platform/web/ @godotengine/web
201-
/platform/web/doc_classes/ @godotengine/web @godotengine/documentation
202-
/platform/windows/ @godotengine/windows
203-
/platform/windows/doc_classes/ @godotengine/windows @godotengine/documentation
204-
205-
# Scene
206-
207-
/scene/2d/ @godotengine/2d-nodes
208-
/scene/2d/physics/ @godotengine/2d-nodes @godotengine/physics
209-
/scene/3d/ @godotengine/3d-nodes
210-
/scene/3d/physics/ @godotengine/3d-nodes @godotengine/physics
211-
/scene/animation/ @godotengine/animation
212-
/scene/audio/ @godotengine/audio
213-
/scene/debugger/ @godotengine/debugger
214-
/scene/gui/ @godotengine/gui-nodes
215-
/scene/main/ @godotengine/core
216-
/scene/resources/2d/ @godotengine/2d-nodes
217-
/scene/resources/3d/ @godotengine/3d-nodes
218-
/scene/resources/animated* @godotengine/animation
219-
/scene/resources/animation* @godotengine/animation
220-
/scene/resources/audio* @godotengine/audio
221-
/scene/resources/font* @godotengine/gui-nodes
222-
/scene/resources/shader* @godotengine/shaders
223-
/scene/resources/text_* @godotengine/gui-nodes
224-
/scene/resources/visual_shader* @godotengine/shaders
225-
/scene/theme/ @godotengine/gui-nodes
226-
/scene/theme/icons/ @godotengine/gui-nodes @godotengine/usability
227-
228-
# Servers
229-
230-
/servers/**/audio_* @godotengine/audio
231-
/servers/**/camera_* @godotengine/xr
232-
/servers/**/debugger_* @godotengine/debugger
233-
/servers/**/navigation_* @godotengine/navigation
234-
/servers/**/physics_* @godotengine/physics
235-
/servers/**/rendering_* @godotengine/rendering
236-
/servers/**/text_* @godotengine/gui-nodes
237-
/servers/**/xr_* @godotengine/xr
238-
/servers/audio/ @godotengine/audio
239-
/servers/camera/ @godotengine/xr
240-
/servers/debugger/ @godotengine/debugger
241-
/servers/navigation/ @godotengine/navigation
242-
/servers/rendering/ @godotengine/rendering
243-
/servers/text/ @godotengine/gui-nodes
244-
/servers/xr/ @godotengine/xr
245-
246-
# Tests
247-
248-
/tests/ @godotengine/tests
249-
250-
# Thirdparty
251-
252-
/thirdparty/ @godotengine/buildsystem
253-
254-
# Buildsystem (After everything to catch all)
255-
256-
/*.* @godotengine/buildsystem
257-
*.py @godotengine/buildsystem
258-
SConstruct @godotengine/buildsystem
259-
SCsub @godotengine/buildsystem
5+
# Intentionally left empty. Do not add entries to this.

‎.github/ISSUE_TEMPLATE/bug_report.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ body:
1919
To properly fix a bug, we need to identify if the bug was recently introduced in the engine, or if it was always present.
2020
- Please specify the Redot version you found the issue in, including the **Git commit hash** if using a development or non-official build. The exact Redot version (including the commit hash) can be copied by clicking the version shown in the editor (bottom bar) or in the project manager (top bar).
2121
- If you can, **please test earlier Redot versions** (previous stable branch, and development snapshots of the current feature release) and, if applicable, newer versions (development snapshots for the next feature release). Mention whether the bug is reproducible or not in the versions you tested. You can find all Redot releases in our [download archive](https://redotengine.org/download/archive/).
22-
- The aim is for us to identify whether a bug is a **regression**, i.e. an issue that didn't exist in a previous version, but was introduced later on, breaking existing functionality. For example, if a bug is reproducible in 4.2.stable but not in 4.1.stable, we would like you to test intermediate 4.2 dev and beta snapshots to find which snapshot is the first one where the issue can be reproduced.
22+
- The aim is for us to identify whether a bug is a **regression**, i.e. an issue that didn't exist in a previous version, but was introduced later on, breaking existing functionality. For example, if a bug is reproducible in 26.3.stable but not in 26.1.stable, we would like you to test intermediate 26.2 dev and beta snapshots to find which snapshot is the first one where the issue can be reproduced.
2323
placeholder: |
2424
25-
- Reproducible in: 4.3.dev [d76c1d0e5], 4.2.stable, 4.2.dev5 and later 4.2 snapshots.
26-
- Not reproducible in: 4.1.3.stable, 4.2.dev4 and earlier 4.2 snapshots.
25+
- Reproducible in: 26.3-rc.1 [5b6b4ff28], 26.2.stable, and later 26.3 snapshots.
26+
- Not reproducible in: 26.1.stable, 4.5.stable and earlier 26.2 snapshots.
2727
validations:
2828
required: true
2929

@@ -35,8 +35,8 @@ body:
3535
- For issues that are likely OS-specific and/or graphics-related, please specify the CPU model and architecture.
3636
- For graphics-related issues, specify the GPU model, driver version, and the rendering backend (GLES2, GLES3, Vulkan).
3737
- **Bug reports not including the required information may be closed at the maintainers' discretion.** If in doubt, always include all the requested information; it's better to include too much information than not enough information.
38-
- **Starting from Redot 4.1, you can copy this information to your clipboard by using *Help > Copy System Info* at the top of the editor window.**
39-
placeholder: Windows 10 - Redot v4.0.3.stable - Vulkan (Forward+) - dedicated NVIDIA GeForce GTX 970 (nvidia, 510.85.02) - Intel Core i7-10700KF CPU @ 3.80GHz (16 Threads)
38+
- **you can copy this information to your clipboard by using *Help > Copy System Info* at the top of the editor window.**
39+
placeholder: Windows 10 - Redot v26.1.stable - Vulkan (Forward+) - dedicated NVIDIA GeForce GTX 970 (nvidia, 510.85.02) - Intel Core i7-10700KF CPU @ 3.80GHz (16 Threads)
4040
validations:
4141
required: true
4242

‎.github/actions/download-artifact/action.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ runs:
1414
using: composite
1515
steps:
1616
- name: Download Godot Artifact
17-
uses: actions/download-artifact@v4
17+
uses: actions/download-artifact@v8
1818
with:
1919
name: ${{ inputs.name }}
2020
path: ${{ inputs.path }}

‎.github/actions/godot-deps/action.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ inputs:
1010
default: x64
1111
scons-version:
1212
description: The SCons version to use.
13-
default: 4.9.0
13+
default: 4.10.1
1414

1515
runs:
1616
using: composite

‎.github/actions/pre-commit/action.yml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: Pre-commit
2+
description: Setup pre-commit, and run it.
3+
4+
inputs:
5+
extra_args:
6+
description: Options to pass to pre-commit run
7+
required: false
8+
default: '--all-files'
9+
10+
runs:
11+
using: composite
12+
steps:
13+
- uses: actions/cache@v5
14+
with:
15+
path: ~/.cache/pre-commit
16+
key: pre-commit|${{ hashFiles('.pre-commit-config.yaml') }}
17+
18+
- run: |
19+
pip install pre-commit
20+
pre-commit install
21+
shell: bash
22+
23+
- run: |
24+
pre-commit run --show-diff-on-failure --color=always --files ${{ inputs.extra_args }}
25+
shell: bash

‎.github/actions/redot-cpp-build/action.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ runs:
2222
using: composite
2323
steps:
2424
- name: Checkout
25-
uses: actions/checkout@v4
25+
uses: actions/checkout@v6
2626
with:
2727
submodules: recursive
2828
repository: Redot-Engine/redot-cpp

‎.github/workflows/android_builds.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ jobs:
3131

3232
steps:
3333
- name: Checkout
34-
uses: actions/checkout@v4
34+
uses: actions/checkout@v6
3535
with:
3636
submodules: recursive
3737

3838
- name: Set up Java 17
39-
uses: actions/setup-java@v4
39+
uses: actions/setup-java@v5
4040
with:
4141
distribution: temurin
4242
java-version: 17

‎.github/workflows/ios_builds.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,11 @@ jobs:
1818

1919
steps:
2020
- name: Checkout
21-
uses: actions/checkout@v4
21+
uses: actions/checkout@v6
2222
with:
2323
submodules: recursive
24+
- name: Select Xcode 26
25+
run: sudo xcode-select -s /Applications/Xcode_26.0.1.app
2426

2527
- name: Restore Godot build cache
2628
uses: ./.github/actions/godot-cache-restore

0 commit comments

Comments
 (0)