diff --git a/.github/actions/godot-cpp-build/action.yml b/.github/actions/godot-cpp-build/action.yml index 9596c5a8fd7..7667527246e 100644 --- a/.github/actions/godot-cpp-build/action.yml +++ b/.github/actions/godot-cpp-build/action.yml @@ -2,7 +2,7 @@ name: Build godot-cpp description: Build godot-cpp with the provided options. env: - GODOT_CPP_BRANCH: 4.3 + GODOT_CPP_BRANCH: 4.4 inputs: bin: diff --git a/misc/dist/macos_tools.app/Contents/Info.plist b/misc/dist/macos_tools.app/Contents/Info.plist index 9078701c91f..83d191a8828 100644 --- a/misc/dist/macos_tools.app/Contents/Info.plist +++ b/misc/dist/macos_tools.app/Contents/Info.plist @@ -17,11 +17,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 4.4 + 4.5 CFBundleSignature GODO CFBundleVersion - 4.4 + 4.5 NSMicrophoneUsageDescription Microphone access is required to capture audio. NSCameraUsageDescription diff --git a/misc/dist/windows/godot.iss b/misc/dist/windows/godot.iss index 35f318cc12b..9bf2f0eb3a0 100644 --- a/misc/dist/windows/godot.iss +++ b/misc/dist/windows/godot.iss @@ -1,5 +1,5 @@ #define MyAppName "Godot Engine" -#define MyAppVersion "4.4" +#define MyAppVersion "4.5" #define MyAppPublisher "Godot Engine contributors" #define MyAppURL "https://godotengine.org/" #define MyAppExeName "godot.exe" diff --git a/misc/extension_api_validation/4.3-stable.expected b/misc/extension_api_validation/4.3-stable_4.4-stable.expected similarity index 98% rename from misc/extension_api_validation/4.3-stable.expected rename to misc/extension_api_validation/4.3-stable_4.4-stable.expected index 527aa0fa293..eaa89fbeb78 100644 --- a/misc/extension_api_validation/4.3-stable.expected +++ b/misc/extension_api_validation/4.3-stable_4.4-stable.expected @@ -1,12 +1,8 @@ -This file contains the expected output of --validate-extension-api when run against the extension_api.json of the -4.3-stable tag (the basename of this file). - -Only lines that start with "Validate extension JSON:" matter, everything else is considered a comment and ignored. They -should instead be used to justify these changes and describe how users should work around these changes. - -Add new entries at the end of the file. +This file contains, when concatenated to the expected output since 4.4, the expected output of --validate-extension-api +when run against the extension_api.json of the 4.3-stable tag (first part of the basename of this file). ## Changes between 4.3-stable and 4.4-stable + GH-95374 -------- Validate extension JSON: Error: Field 'classes/ShapeCast2D/properties/collision_result': getter changed value in new API, from "_get_collision_result" to &"get_collision_result". diff --git a/misc/extension_api_validation/4.4-stable.expected b/misc/extension_api_validation/4.4-stable.expected new file mode 100644 index 00000000000..a3ea3f2ed10 --- /dev/null +++ b/misc/extension_api_validation/4.4-stable.expected @@ -0,0 +1,9 @@ +This file contains the expected output of --validate-extension-api when run against the extension_api.json of the +4.4-stable tag (the basename of this file). + +Only lines that start with "Validate extension JSON:" matter, everything else is considered a comment and ignored. They +should instead be used to justify these changes and describe how users should work around these changes. + +Add new entries at the end of the file. + +## Changes between 4.4-stable and 4.5-stable diff --git a/modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk/Godot.NET.Sdk.csproj b/modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk/Godot.NET.Sdk.csproj index c5f2dfee4b3..f22870f01ba 100644 --- a/modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk/Godot.NET.Sdk.csproj +++ b/modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk/Godot.NET.Sdk.csproj @@ -7,7 +7,7 @@ Godot Engine contributors Godot.NET.Sdk - 4.4.0 + 4.5.0 $(PackageVersion_Godot_NET_Sdk) https://github.com/godotengine/godot/tree/master/modules/mono/editor/Godot.NET.Sdk $(RepositoryUrl) diff --git a/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/Godot.SourceGenerators.csproj b/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/Godot.SourceGenerators.csproj index e8302f41375..ecf36ef1bc6 100644 --- a/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/Godot.SourceGenerators.csproj +++ b/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/Godot.SourceGenerators.csproj @@ -10,7 +10,7 @@ Godot Engine contributors Godot.SourceGenerators - 4.4.0 + 4.5.0 $(PackageVersion_Godot_SourceGenerators) https://github.com/godotengine/godot/tree/master/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators $(RepositoryUrl) diff --git a/modules/mono/glue/GodotSharp/GodotSharp/GodotSharp.csproj b/modules/mono/glue/GodotSharp/GodotSharp/GodotSharp.csproj index ab9c5fe18a2..78c2981fea0 100644 --- a/modules/mono/glue/GodotSharp/GodotSharp/GodotSharp.csproj +++ b/modules/mono/glue/GodotSharp/GodotSharp/GodotSharp.csproj @@ -19,7 +19,7 @@ Godot Engine contributors GodotSharp - 4.4.0 + 4.5.0 $(PackageVersion_GodotSharp) https://github.com/godotengine/godot/tree/master/modules/mono/glue/GodotSharp/GodotSharp $(RepositoryUrl) diff --git a/modules/mono/glue/GodotSharp/GodotSharpEditor/GodotSharpEditor.csproj b/modules/mono/glue/GodotSharp/GodotSharpEditor/GodotSharpEditor.csproj index 0ccc463dd41..f7a7f7a7ff0 100644 --- a/modules/mono/glue/GodotSharp/GodotSharpEditor/GodotSharpEditor.csproj +++ b/modules/mono/glue/GodotSharp/GodotSharpEditor/GodotSharpEditor.csproj @@ -15,7 +15,7 @@ Godot Engine contributors GodotSharpEditor - 4.4.0 + 4.5.0 $(PackageVersion_GodotSharp) https://github.com/godotengine/godot/tree/master/modules/mono/glue/GodotSharp/GodotSharpEditor $(RepositoryUrl) diff --git a/version.py b/version.py index e08a28ecfd7..7b3bd015db8 100644 --- a/version.py +++ b/version.py @@ -1,9 +1,9 @@ short_name = "godot" name = "Godot Engine" major = 4 -minor = 4 +minor = 5 patch = 0 -status = "stable" +status = "dev" module_config = "" website = "https://godotengine.org" -docs = "4.4" +docs = "latest"