Commit Graph

52673 Commits

Author SHA1 Message Date
Haoyu Qiu b4a1bfd6d5 Fix coloring of the renderer options button
(cherry picked from commit ac7a4f6e87)
2023-03-14 13:59:03 +01:00
Johan Aires Rastén 4ff705b37e Fix instance uniforms breaking when setting a new mesh.
Fixes #58113

(cherry picked from commit 26aecbfe57)
2023-03-14 13:59:03 +01:00
Ryan Roden-Corrent 47dc4bc307 Don't unset local_coords on starting transform.
This fixes a bug introduced by 806425621c, where dragging the gizmo no longer respected local transforms.

I'm not sure why I called set_local_coords_enabled(false) in _compute_edit. Removing this line seems to fix gizmo-dragging local transforms, without breaking anything else.

I also noticed that confirming a transform leaves the gizmo axis lines on the screen. This is fixed by calling update_transform_gizmo after clearing the edit mode/instant flags, so update_transform_gizmo knows not to render any axes.

(cherry picked from commit d3d1223b97)
2023-03-14 13:59:03 +01:00
clayjohn 08845dc3f0 Propogate errors when creating an OpenGL context fails in X11
(cherry picked from commit e7ea3ef531)
2023-03-14 13:59:03 +01:00
SlugFiller d508d0a642 Fixes a canvas item set to clip children being drawn as black if no children are visible
(cherry picked from commit f25508befb)
2023-03-14 13:59:03 +01:00
SlugFiller 18bf2663f9 Fix AABB calculation for meshes using Skeleton2D
(cherry picked from commit 06a1fe0364)
2023-03-14 13:59:03 +01:00
Johan Aires Rastén d229ca2f27 Fixed incorrect ERROR message when setting new PrimitiveMesh
If calling set_mesh with a PrimitiveMesh that has pending update, the
_mesh_changed function would be called twice. The first time before
set_base had been called, which could lead to an ERROR message about
trying to set an invalid surface override material.

(cherry picked from commit 007b488a5c)
2023-03-14 13:59:03 +01:00
Ryan Roden-Corrent 89a40d317d Disable local space for blender transforms.
Having local_space enabled when starting a transform changed the
behavior of VIEW space transforms. Now we disable local_space when
starting a blender transform (there was already logic to restore the
setting after the transform ends).

This also hides the gizmo while performing a blender transform,
otherwise the user will see it snap back and forth between the local and
global alignment. I think the transform looks cleaner with the gizmo
hidden anyways.

Fixes #59392.

(cherry picked from commit 806425621c)
2023-03-14 13:59:03 +01:00
Rindbee 323c3f80c5 Fix broken shortcut key input
(cherry picked from commit 91e460d500)
2023-03-14 13:59:03 +01:00
Jakub Mateusz Marcowski 5a7624e50f Modify JSON.stringify so that it doesn't create unnecessary empty lines from empty arrays
(cherry picked from commit 0a55a32085)
2023-03-14 13:59:03 +01:00
Rémi Verschelde 7e74568709 FBX: Disable importer when canceling FBX2glTF setup
Pretty hacky solution but it's better than an infinite loop.

All this import setup needs to be redone, it's very difficult to properly
bail out from an invalid import without triggering reimport loops.

Also fix underline not visible at default editor scale in LinkButton.

Fixes #73319.

(cherry picked from commit d81e6ee024)
2023-03-14 13:59:02 +01:00
clayjohn 278fc7538d Avoid overflow when calculating ptr address for 3D textures in RenderingDevice texture update
(cherry picked from commit 06042a23b6)
2023-03-14 13:59:02 +01:00
Yuri Sizov 258ea41ffa
Merge pull request #74884 from YuriSizov/4.0-cherrypicks
Cherry-picks for the 4.0 branch (future 4.0.1) - 2nd batch
2023-03-14 13:57:36 +01:00
Yuri Sizov 84e9a79ace Add missing handler for removing font sizes in Themes
(cherry picked from commit 5a3dbea3ed)
2023-03-13 22:22:05 +01:00
clayjohn a41a813af4 Set properties of ImageTexture3D when creating
(cherry picked from commit e9d80a821d)
2023-03-13 22:20:32 +01:00
juliuse98 e3e117cac5 Fix blend-file import when using custom color management in blender
When using custom color management in blender the --version command will
output additional information infront of the "normal" output and this
prevented the import.

Fixes #74439.

(cherry picked from commit 7a0d12182e)
2023-03-13 22:19:36 +01:00
bruvzg 494449f212 [TextServer] Fix justification on punctuation characters.
(cherry picked from commit 016b2f3555)
2023-03-13 22:18:04 +01:00
smix8 069c48bfdc Fix NavigationServer free error print
Fixes error print for NavigationServer free when a RID can not be found.

(cherry picked from commit 73dc680fc1)
2023-03-13 22:12:27 +01:00
Ninni Pipping 75e078d885 Fix type icons in `PropertySelector`
And adding a check to prevent future issues.

(cherry picked from commit ca86d53e7f)
2023-03-13 22:11:46 +01:00
Thomas Lobig a755ac856a remove incorrect rename of get_used_cells_by_id
renaming get_used_cells_by_id to get_used_cells is not only unecessary, it introduces hard to debug issues

(cherry picked from commit d6a2197b3d)
2023-03-13 22:10:04 +01:00
bruvzg 34c909b41e [TextEdit] Do not draw virtual spaces (word break / justification points).
(cherry picked from commit 25bc62ad13)
2023-03-13 22:09:27 +01:00
Rémi Verschelde b1c8a40853 Windows: Workaround missing DWRITE_FONT_WEIGHT value in old MinGW
Fixes #74339.

(cherry picked from commit b7ecb9584a)
2023-03-13 22:06:14 +01:00
Hakim 90dbf3bd38 Get the unlit / unshaded extension when importing GLTF and set it when exporting
(cherry picked from commit e14fa5532b)
2023-03-13 22:05:07 +01:00
bruvzg 4cce358241 [Windows] Update modifier key status during IME input.
(cherry picked from commit ba995c6ea1)
2023-03-13 22:04:08 +01:00
bruvzg ef3f1d426d [Web] Fix some missing keycode mappings.
(cherry picked from commit 0b0587af97)
2023-03-13 22:00:15 +01:00
clayjohn bc6743c96d Add proper default texture filter and repeat modes for Canvas shaders in the OpenGL3 renderer
(cherry picked from commit 46b416f3b1)
2023-03-13 21:58:51 +01:00
Haoyu Qiu 050ec70ea4 Notify child controls when BackBufferCopy's rect changed
(cherry picked from commit 602a0d2fbc)
2023-03-13 21:57:20 +01:00
RedworkDE 20eeb7c66d C#: Get singleton instances using the Core name
(cherry picked from commit 16a2a164fe)
2023-03-13 21:56:31 +01:00
Raul Santos ad6fa1cd25 C#: Ignore explicit interface implementations
(cherry picked from commit 0372bd56b6)
2023-03-13 21:55:11 +01:00
Dmitrii Maganov 079c8ea719 GDScript: Fix checking if a call is awaited in compiler
(cherry picked from commit 55a2ad25bf)
2023-03-13 21:54:05 +01:00
Aleks Rutins 782e1fe84e Validate that C# class names are valid identifiers
(cherry picked from commit ae8752a731)
2023-03-13 21:52:44 +01:00
Fabio Iotti 01324f025a Error on hint_normal_roughness_texture and hint_depth_texture outside of spatial shader
(cherry picked from commit 528e0d095e)
2023-03-13 21:51:36 +01:00
Rémi Verschelde c6f7675b1f Linux: Don't try to link system embree3 on unsupported archs
(cherry picked from commit afb8693715)
2023-03-13 21:49:15 +01:00
Bastiaan Olij c8f64c68a5 Use MSAA 2D texture in multipass tonemapper
(cherry picked from commit 903aa0e385)
2023-03-13 21:48:02 +01:00
kobewi 4e90cc55ec Check for type mismatch in PropertyTweener.from()
(cherry picked from commit 45f4d59fa4)
2023-03-13 21:45:34 +01:00
clayjohn 925381201b Add a few more rendering timestamps
(cherry picked from commit 1adc4e5875)
2023-03-13 21:43:38 +01:00
bruvzg 48a639f4a5 [Bitmap font] Assume outline size is `1` if it's not set, but channel for outline is defined.
(cherry picked from commit 67762ec4a6)
2023-03-13 21:41:21 +01:00
bruvzg 57dc060879 Fix Windows to Windows SSH remote deploy. Fix Windows `execute` exit code.
(cherry picked from commit 94355249c3)
2023-03-13 21:37:41 +01:00
Arman Elgudzhyan 7e6bc72f7c Don't autocomplete numbers in GDScript
Cancel code autocompletion when a numerical value is entered. Avoids interference when setting numbers.

(cherry picked from commit 688d00b706)
2023-03-13 21:35:23 +01:00
clayjohn 13b37a50ae Add parentheses around arguments when converting xform
(cherry picked from commit 3ee5fbdb73)
2023-03-13 21:33:35 +01:00
Ryan Roden-Corrent 81f4996683 Add some missing renames to 3to4 tool.
MultiplayerPeerExtension isn't an exact replacement for
NetworkedMultiplayerCustom, but at least it gets you moving in the right direction.

Engine.editor_hint couldn't be fixed by the renames map, because you have to add a `()` at the end.

(cherry picked from commit 6b17c2b6e7)
2023-03-13 21:32:51 +01:00
Ryan Roden-Corrent 06e2c6ace2 Move tool declarations to top in 3to4.
In godot3, `tool` can follow keywords like `extends` and `class_name`
In godot4, `@tool` must be the first line in the file.

(cherry picked from commit 9a474fb99f)
2023-03-13 21:31:53 +01:00
Marius Hanl 9fff0fcbb5 Project Converter: Do not convert lines that start with a comment
Lines that start with # or // are ignored

(cherry picked from commit 8cf7ac3a45)
2023-03-13 21:31:23 +01:00
Ninni Pipping f6709a1fda Add keycode project conversion
(cherry picked from commit fec630f360)
2023-03-13 21:28:58 +01:00
Marcus Elg 6041ad5c70 Fix Camera2D position smoothing properties not being grouped
(cherry picked from commit a835dfd96d)
2023-03-13 21:25:14 +01:00
Ryan Roden-Corrent 6cd227a35c Correct superclass constructors in 3to4.
Fixes #70542.

The 3to4 conversion tool was not handling superclass constructors.
We should translate the godot3 syntax:

```gdscript
func _init(a,b,c).(a,b,c):
    pass

func _init(a,b,c):
    super(a,b,c)
```

Originally, the _init conversion was intended to remove `void` return types from _init functions, as this was disallowed due to #50589.
As that was resolved by #53366, I removed that part of the conversion logic. If a void return type is present on a constructor, the converter now leaves it.

Here's a sample diff from my own project:

```diff
@@ -103,10 +105,11 @@ class Real:
 class Text:
        extends Setting

-       var choices: PoolStringArray
-       var value: String setget set_value, get_value
+       var choices: PackedStringArray
+       var value: String : get = get_value, set = set_value

-       func _init(section: String, key: String, default: String, choice_list: Array).(section, key, default) -> void:
+       func _init(section: String, key: String, default: String, choice_list: Array) -> void:
+               super(section, key, default)
                choices = choice_list

        func normalize(val):
@@ -129,9 +132,10 @@ class Text:
 class Boolean:
        extends Setting

-       var value: bool setget set_value, get_value
+       var value: bool : get = get_value, set = set_value

-       func _init(section: String, key: String, default: bool).(section, key, default) -> void:
+       func _init(section: String, key: String, default: bool) -> void:
+               super(section, key, default)
                pass
```

(cherry picked from commit 53a00abb11)
2023-03-13 21:19:53 +01:00
Ryan Roden-Corrent 1421838ba7 Don't strip whitespace when converting 3to4.
Fixes #74204.

The style guide says

> Always use one space around operators and after commas

The 3to4 conversion tool currently strips space in certain scenarios.
I've updated it to add space whenever it is generating new code.
In any case where it substitutes existing code, it leaves it as-is.

For example, connect(a,b,c) becomes `connect(a, callable(b, c))`, because the converter is adding new commads/parens.

However, `xform(Vector3(a,b,c))` becomes `Transform * Vector3(a,b,c)` because it uses the user's original Vector3 string whole. If the user originally had `xform(Vector3(a, b, c))`, then it becomes `Transform * Vector3(a, b, c)`.

Ideally we'd always preserve original formatting, but this seems quite difficult, so I tried to preserve it where we can, but air on the side of following the style guide whenever we're transforming code.

(cherry picked from commit d3684e662f)
2023-03-13 21:18:53 +01:00
Yuri Sizov 30e81fcc26
Merge pull request #74866 from YuriSizov/4.0-cherrypicks
Cherry-picks for the 4.0 branch (future 4.0.1) - 1st batch
2023-03-13 16:58:31 +01:00
Ninni Pipping 857cd853de Fix TileSetEditor paiting texture_origin Vector2i
(cherry picked from commit fb317546fe)
2023-03-13 14:52:22 +01:00
Raul Santos 1640b1a150 C#: Always show "Create C# solution" option
Prevents ending up with an empty C# menu.
The option to create the C# solution no longer disappears, to avoid confusing users.
If an user tries to use it when a C# solution already exists they are warned that it will override their sln and csproj files.

(cherry picked from commit a1a2fc2255)
2023-03-13 14:50:57 +01:00