Commit graph

14315 commits

Author SHA1 Message Date
mrcdk
c9bdccf7f2 Expose PopupMenu get_item_multistate(), get_item_multistate_max() and set_item_multistate_max() 2024-01-22 20:07:19 +01:00
风青山
0c6b6fe749 Fix issue where set_global_position(global_position) in Control resulted in a different result than global_position
Previously, the case where the pivot point was not at the origin was ignored.
2024-01-23 00:05:11 +08:00
风青山
567e76f935 Fix forgetting h_separation when internal elements exist 2024-01-22 22:20:01 +08:00
A Thousand Ships
552594ffdc
Redraw TreeItem on more changes
* Custom font changes
* Custom draw changes
* Custom as button
2024-01-22 13:51:20 +01:00
jsjtxietian
3c596094ab Fix pass int to tween's from with float property will be forced to interpolate as int 2024-01-22 10:47:52 +08:00
Marcel Offermans
25f573ca63 Add a reflection mask to the reflection probes.
Co-authored-by: Bastiaan Olij <mux213@gmail.com>
2024-01-20 08:07:31 +01:00
nikitalita
bcad569ed9 Skeleton3D: Convert 3.x skeletons 2024-01-19 17:43:09 -08:00
Markus Sauermann
7b00c136a1 Fix SubViewport physics picking
Apply the logic of `handle_input_locally` for physics picking.
2024-01-19 21:42:41 +01:00
kobewi
2c14c0885f Add PropertyListHelper 2024-01-19 20:32:04 +01:00
smix8
d6c31017a6 Add NavigationMesh border_size property for tile baking
Adds NavigationMesh border_size property for tile baking.
2024-01-19 17:31:36 +01:00
Hendrik Brucker
f59419bfe0 Add connection-related VisualShader operations
- Insert a node in a connection
- Drop an unconnected node on a connection to insert it
- Delete a connection
2024-01-19 11:38:59 +01:00
Yuri Sizov
66b0bd9203 Merge pull request #86158 from Geometror/ge-connection-rework
Rework `GraphEdit` connections (drawing, API, optimizations)
2024-01-18 19:26:56 +01:00
Yuri Sizov
bc88d771e6 Merge pull request #64351 from Rindbee/fix-button-draw
Make the drawing logic clearer in `Button`
2024-01-18 19:26:48 +01:00
Hendrik Brucker
9d7c2978f4 Rework GraphEdit connections (drawing, API, optimizations)
- GraphEdit now uses Line2D nodes to draw connection lines and uses a dedicated canvas item shader for them
2024-01-18 16:53:15 +01:00
Rindbee
f29a7d302e Make the drawing logic clearer in Button
The drawing logic follows the calculation logic in `Button::get_minimum_size`.

According to the order of `stylebox`, `icon`, and `text`, and follow properties
such as alignment mode, to fill the display space of the button.

Add a `Button::_set_h_separation_is_valid_when_no_text` for Button derived
classes (like `OptionButton`) that expects a `h_separation` between `icon`
and theme icon even if the `text` is empty.
2024-01-18 22:57:22 +08:00
Gilles Roudière
9dfc012369 Remove unecessary _set_global_invalid added by mistake 2024-01-18 10:48:23 +01:00
Rémi Verschelde
8f9c815ddb
Merge pull request #87061 from KoBeWi/shadow_of_the_former_self
Add AudioStreamPlayerInternal to unify stream players
2024-01-18 09:34:42 +01:00
Rémi Verschelde
fa81059b9d
Merge pull request #85939 from adamscott/single-threaded-godot-4
Add `THREADS_ENABLED` macro in order to compile Godot to run on the main thread
2024-01-18 09:33:52 +01:00
Adam Scott
bd70b8e1f6
Add THREADS_ENABLED macro in order to compile Godot to run on the main thread 2024-01-17 13:58:29 -05:00
Yuri Sizov
788aab3a96 Merge pull request #87115 from groud/tilemap_layers_as_nodes
Make TileMapLayers extend Node2D and work as children of TileMap
2024-01-17 18:53:12 +01:00
Yuri Sizov
0724506cdd Merge pull request #86841 from groud/fix_global_transform_in_enter_tree
Fixes global transform being wrong on entering tree
2024-01-17 18:52:59 +01:00
Yuri Sizov
28cf7fe2f6 Merge pull request #85384 from HolonProduction/unique-name-completion
Suggest scene unique nodes in `get_node` autocompletion
2024-01-17 18:52:31 +01:00
Yuri Sizov
2e1f4f4a9d Merge pull request #84610 from jsjtxietian/update-gizmo-right-after-assign
Fix CollisionObject3D Gizmo not updated after calling `shape_owner_*` functions
2024-01-17 18:52:26 +01:00
Gilles Roudière
48bed5050b Make TileMapLayers extend Node2D and work as children of TileMap 2024-01-17 16:05:50 +01:00
kobewi
0c7db3cdad Add AudioStreamPlayerInternal to unify stream players 2024-01-17 13:12:02 +01:00
jsjtxietian
80a488a242 Fix CollisionObject3D Gizmo not updated after calling shape_owner_* functions 2024-01-17 10:43:16 +08:00
Gilles Roudière
0a726d692a Fixes global transform being wrong on entering tree 2024-01-16 16:02:37 +01:00
ajreckof
2f697926b0 Fix renaming a node to the name of its siblings breaking NodePath
Also fix cases where node name was not visually updated because name was not changed

Co-Authored-By: Nông Văn Tình <53887662+nongvantinh@users.noreply.github.com>
2024-01-16 15:18:30 +01:00
Rémi Verschelde
04eafd557f
Merge pull request #87249 from bruvzg/macos_menu_clear
[macOS] Do not unbind PopupMenu from global menu on `clear` call.
2024-01-16 15:07:47 +01:00
Rémi Verschelde
0f4bc9c085
Merge pull request #84312 from nickyfoo/fix-remove-paragraph-crash
[RichTextLabel] Fix `remove_paragraph` crash by popping current
2024-01-16 15:07:33 +01:00
bruvzg
5a61fecd0e
[macOS] Do not unbind PopupMenu from global menu on clear call. 2024-01-16 15:33:14 +02:00
Nicholas Foo
c0f8e0061d
Fix RichTextLabel.remove_paragraph crash by popping current 2024-01-16 13:52:19 +02:00
Yuri Sizov
95b27fe8c7 Reorganize code related to editor theming
This change introduces a new EditorThemeManager class
to abstract theme generatio and its subroutines.

Logic related to EditorTheme, EditorColorMap, and editor
icons has been extracted into their respective files with
includes cleaned up.

All related files have been moved to a separate folder to
better scope them in the project. This includes relevant
generated files as well.
2024-01-16 11:57:45 +01:00
Rémi Verschelde
3df0c5be6a
Merge pull request #86473 from reduz/audio-playback-parameters
Implement audio stream playback parameters.
2024-01-16 10:35:36 +01:00
Rémi Verschelde
039379d272
Merge pull request #84193 from kitbdev/dock-manager-extract
Extract `EditorDockManager` from `EditorNode`
2024-01-16 10:35:11 +01:00
Juan Linietsky
a40fe16866 Implement audio stream playback parameters.
Implements a way for audio stream playback to be configured via parameters
directly in the edited AudioStreamPlayer[2D/3D].

Currently, configuring the playback stream is not possible (or is sometimes hacky
as the user has to obtain the currently played stream, which is not always immediately available).

This PR only implements this new feature to control looping in stream playback instances (a commonly requested feature, which was lost in the transition from Godot 2 to Godot 3).
But the idea is that it can do a lot more:

* If effects are bundled to the stream, control per playback instance parameters such as cutoff or resoance, or any other exposed effect parameter per playback instance.
* For the upcoming interactive music PR (#64488), this exposes an easy way to change the active clip, which was not possible before.
* For the upcoming parametrizable audio support (https://github.com/godotengine/godot-proposals/issues/3394) this allows editing and animating audio graph parameters.

In any case, this PR is required to complete #64488.

Update modules/vorbis/audio_stream_ogg_vorbis.h

Co-authored-by: A Thousand Ships <96648715+AThousandShips@users.noreply.github.com>

Update modules/minimp3/audio_stream_mp3.h

Co-authored-by: A Thousand Ships <96648715+AThousandShips@users.noreply.github.com>

Update modules/minimp3/audio_stream_mp3.h

Co-authored-by: A Thousand Ships <96648715+AThousandShips@users.noreply.github.com>

Update modules/vorbis/audio_stream_ogg_vorbis.h

Co-authored-by: A Thousand Ships <96648715+AThousandShips@users.noreply.github.com>

Update doc/classes/AudioStream.xml

Co-authored-by: A Thousand Ships <96648715+AThousandShips@users.noreply.github.com>
2024-01-16 10:31:52 +01:00
kit
2323f040e9 Extract editor dock manager 2024-01-15 15:15:42 -05:00
Rémi Verschelde
fe76b61743
Merge pull request #87160 from kleonc/tilemap-fix-debug-drawing-truncations-to-ints
Fix some `TileMap` debug drawing truncating to ints
2024-01-15 13:31:04 +01:00
Rémi Verschelde
3482da422d
Merge pull request #87012 from TheSofox/line-edit-undo-caret-fix
Fix `LineEdit` caret rendering/positioning on Undo.
2024-01-15 13:27:02 +01:00
Rémi Verschelde
03767fbf3b
Merge pull request #86446 from reduz/transient-to-focused
Implement a `transient_to_focused` Window mode
2024-01-15 13:25:00 +01:00
Rémi Verschelde
c1da69d8f2
Merge pull request #86141 from Maran23/popup-hover-height-calc
Fix Popup hover and height calculation are off by some pixels
2024-01-15 13:23:42 +01:00
Rémi Verschelde
ebc30b93ac
Merge pull request #84465 from KeyboardDanni/deferred_camera
Fix Camera2D frame delay (port from 3.x)
2024-01-15 13:22:28 +01:00
ACB
96b8016a35 Rename camera near and far private members to avoid conflict with Windows.h defines 2024-01-15 12:31:15 +01:00
Robert Yevdokimov
06c2cda848 Fix selecting popup menu items on mouse release 2024-01-14 17:45:52 -05:00
Juan Linietsky
15144c24bd Implement a transient_to_focused mode
This intends to be the correct way to handle non-child windows becoming covered by the current window when becoming focused.
Enabling this property on select windows, they will become transient to the currently focused one when becoming visible.

This deprecates the "unparent_when_invisible" function introduced by #76025.
2024-01-14 18:51:44 +01:00
kleonc
baa5504700 Fix some TileMap debug drawing truncating to ints 2024-01-14 02:02:46 +01:00
Jakub Marcowski
06534f8ad5 Add deprecation notice to a duplicate method of class Window 2024-01-12 18:18:28 +01:00
Rémi Verschelde
1b25b4ca5f
Merge pull request #83397 from thiagola92/readability_skeleton_2d_calculate_length_and_rotation
Refactor function `calculate_length_and_rotation()` from Skeleton2D
2024-01-11 20:44:26 +01:00
Rémi Verschelde
cab27498bd
Merge pull request #86957 from RandomShaper/mt_mends
A couple of enhancements to user-visible threading semantics
2024-01-11 17:40:37 +01:00
Rémi Verschelde
79791a3855
Merge pull request #86931 from LeoBelda/fix-create-prism-mesh-division-by-zero
Prevent division by 0 when creating vertices of a PrismMesh
2024-01-11 17:40:12 +01:00
Rémi Verschelde
087a397477
Merge pull request #86301 from KoBeWi/deferred_cleanup
Update deferred calls to use Callables
2024-01-11 17:36:29 +01:00
thiagola92
6a05825b24 Refactor function calculate_length_and_rotation() from Skeleton2D 2024-01-11 13:35:28 -03:00
Rémi Verschelde
f3fc35eb17
Merge pull request #81506 from twobitadder/reparent_keep_owner
Fix `reparent()` losing owner
2024-01-11 17:34:19 +01:00
mnemoli
a407219693 Add Viewport setting for picking only first-encountered CanvasItem physics object 2024-01-11 14:18:37 +00:00
Leo Belda
83992fd7bd Fix PrismMesh::_create_mesh_array division by 0 2024-01-10 23:01:43 +01:00
Rémi Verschelde
365755fb34
Merge pull request #84946 from DarkMessiah/default-theme-checkbox-disabled-state
Use disabled icons for CheckBox in DefaultTheme
2024-01-10 12:03:12 +01:00
Sofox
6888d957dc Fix LineEdit caret rendering/positioning on Undo. 2024-01-09 17:14:55 +00:00
kobewi
0e8f90f4c8 Update deferred calls to use Callables 2024-01-09 16:11:47 +01:00
Rémi Verschelde
1d3f98ac6a
Merge pull request #86894 from jsjtxietian/merge-dafault-font
In `merge_with` also merge some default fields of theme
2024-01-09 11:29:52 +01:00
Rémi Verschelde
4181027596
Merge pull request #84442 from Calinou/colorpicker-allow-more-hex-codes
Allow additional hexadecimal color codes in ColorPicker
2024-01-09 11:27:14 +01:00
Yaohua Xiong
43b184b409 Fix PathFollow3D update issues
- transform is not updated after setting new flags such as `use_model_front`
- transform is not updated when the parent Path3D changes
- correct_posture() behaves differently when assuming model front
- _update_transform() was in immediate mode, could leads to chained calls on scene instantiation.
2024-01-09 10:28:16 +08:00
Silc Lizard (Tokage) Renew
f8da9460c1 Make default blend_left consider current blend amount 2024-01-09 05:07:27 +09:00
Hugo Locurcio
80a770a8ed
Allow additional hexadecimal color codes in ColorPicker
The following formats are now accepted (leading `#` is optional):

- `#1` -> `#111111`
- `#12` -> `#121212`
- `#12345` -> `#11223344` (`5` at the end is discarded)
- `#1234567` -> `#123456` (`7` at the end is discarded)
2024-01-08 20:51:45 +01:00
Rémi Verschelde
84e205b5a1
Merge pull request #86950 from jsjtxietian/fix-compress-image-error
Fix wrong fail condition in compressed texture's `_set_data`
2024-01-08 14:53:43 +01:00
Rémi Verschelde
d8dc554241
Merge pull request #86847 from kleonc/tilemap-make-quadrant-canvas-item-position-local
Fix `TileMap` quadrant canvas item position not being local
2024-01-08 14:52:54 +01:00
Rémi Verschelde
a7e347482b
Merge pull request #86687 from TokageItLab/AnimationMixer-remove-object-pointer
Fix TrackCache conflict when tracks have same name but different type
2024-01-08 14:52:30 +01:00
Rémi Verschelde
129332e3b9
Merge pull request #82468 from kitbdev/tabcontainer-bottom
Option to put TabContainer tabs at bottom
2024-01-08 14:51:37 +01:00
kleonc
3c25274870 Fix TileMap quadrant canvas item position not being local 2024-01-08 14:20:16 +01:00
Silc Lizard (Tokage) Renew
a51958a2a0 Remove Object pointer/solve types conflict in AnimationTrackCache
Co-authored-by: Rémi Verschelde <rverschelde@gmail.com>
2024-01-08 21:48:19 +09:00
Rémi Verschelde
4ca33d318b
Merge pull request #86908 from AdSkipper1337/collision-object-2d-gdextension-virtuals
Fix virtual calls for GDExtension in `CollisionObject2D`
2024-01-08 12:01:31 +01:00
Rémi Verschelde
c9ef2fdb0b
Merge pull request #86891 from Mickeon/autocompletion-get-node-or-null
Add autocompletion to `get_node_or_null`
2024-01-08 12:00:19 +01:00
Rémi Verschelde
6226388bac
Merge pull request #86874 from AThousandShips/no_3d_fix
Fix some build errors with `disable_3d=yes`
2024-01-08 11:59:31 +01:00
Rémi Verschelde
c7fb7273c5
Merge pull request #86811 from TheSofox/light2d-blend-3to4
Added compatibility for Blend Mode in `Light2D`/`PointLight2D` when converting from Godot 3 to 4.
2024-01-08 11:57:07 +01:00
Rémi Verschelde
665c3edee2
Merge pull request #86557 from kleonc/polygon2d-with-skeleton-transform-fix
Fix Polygon2D to Skeleton2D transform calculation
2024-01-08 11:55:06 +01:00
Rémi Verschelde
97607b6ab3
Merge pull request #86474 from KoBeWi/particular_velocity
Only update particle velocity when it changes
2024-01-08 11:53:53 +01:00
Rémi Verschelde
48b726deba
Merge pull request #86417 from LimestaX/tscn-escape-char-fix
Ensure special characters are escaped in TSCN connections and editable hint
2024-01-08 11:53:28 +01:00
Rémi Verschelde
26ae551108
Merge pull request #85870 from dsnopek/collision-object-3d-gdextension-virtuals
Fix overriding `CollisionObject3D::_mouse_enter()` and `_mouse_exit()` from GDExtension
2024-01-08 11:51:52 +01:00
Rémi Verschelde
81f618d63a
Merge pull request #85180 from AThousandShips/self_list_fix
[Core] Prevent copying of `SelfList` and `SelfList::List`
2024-01-08 11:51:27 +01:00
Rémi Verschelde
df29fc91ed
Merge pull request #82669 from 4d49/graph-node-slot-custom-icon
Add `set_slot_custom_icon` and `get_slot_custom_icon` to GraphNode
2024-01-08 11:49:46 +01:00
Rémi Verschelde
91dacb469d
Merge pull request #51156 from Muller-Castro/value2ref
Add const lvalue ref to container parameters
2024-01-08 11:48:34 +01:00
LimestaX
0a32c160ac
Ensure special characters are escaped in tscn connections and editable hint 2024-01-08 11:42:30 +01:00
Yaohua Xiong
0e344f0d0b Path3D notify transform change to CSGPolygon 2024-01-08 18:29:18 +08:00
Pedro J. Estébanez
631d1e3a86 Let read thread guards allow access to out-of-tree nodes 2024-01-08 10:33:09 +01:00
Mansur Isaev
631d722674
Add set_slot_custom_icon and get_slot_custom_icon to GraphNode 2024-01-08 08:30:10 +01:00
jsjtxietian
6a3b63eb36 Fix wrong fail contion in compressed texture and some clean up 2024-01-08 12:53:18 +08:00
jsjtxietian
6f3568e3db In merge_with also merge some default fileds of theme 2024-01-08 10:41:30 +08:00
Nikolai Davydov
0517000e6f Fix virtual calls for GDExtension in CollisionObject2D for _mouse_enter, _mouse_exit, _mouse_shape_enter, _mouse_shape_exit 2024-01-07 05:30:26 +01:00
A Thousand Ships
904ecb1d36
[Core] Prevent copying of SelfList and SelfList::List
Copying of these types is unsafe and should be detected

Also removed unnecessary constructors for `TileMap` `DebugQuadrant` and
`RenderingQuadrant` which used copying of `SelfList::List`
2024-01-07 00:48:23 +01:00
A Thousand Ships
c6a1ae7875
Fix some build errors with disable_3d=Yes
* Some tests were incorrectly included
* SCU builds with animation
* Animation `switch`
2024-01-07 00:44:33 +01:00
kit
f6a212837b TabContainer bottom position 2024-01-06 15:31:08 -05:00
nklbdev
e72ccc2080 Fix lossless formats in PortableCompressedTexture2D (fix data format storing) 2024-01-06 22:56:25 +05:00
Micky
f996003fb4 Add autocompletion to get_node_or_null 2024-01-06 17:33:32 +01:00
Micky
e5c1da1c61 Add Autocompletion for AnimationNodeStateMachine & BlendTree 2024-01-06 17:03:46 +01:00
Zi Ye
97f9dbda81 Changed various editor transform operations to be committed in local instead of global space. Fixed a couple of bugs when syncing transforms to debug instance. 2024-01-05 17:07:20 -06:00
Muller-Castro
96a95cb974 Add const lvalue ref to container parameters 2024-01-05 14:49:57 -03:00
Sofox
58ae3c577c Added compatibility for Blend Mode in Light2D/PointLight2D when converting from Godot 3 to 4 2024-01-05 15:39:47 +00:00
Rémi Verschelde
62616fb14f
Merge pull request #86799 from Mickeon/autocompletion-animationlibrary
Add autocompletion for AnimationLibrary & AnimationMixer's methods
2024-01-05 12:06:21 +01:00
Rémi Verschelde
1e676e4a0a
Merge pull request #85791 from groud/move_tilemap_layers_to_own_file
Move TileMapLayer to its own files
2024-01-05 12:04:18 +01:00
Rémi Verschelde
dc5b57ea44
Merge pull request #81325 from AttackButton/path_2d_editor_plugin-clear_points
Add a button to clear curve points in the Path2D editor
2024-01-05 12:02:41 +01:00
Rémi Verschelde
d1b7c60afc
Merge pull request #77712 from nklbdev/Fix_lossless_formats_in_PortableCompressedTexture2D
Fix lossless formats in PortableCompressedTexture2D
2024-01-05 12:02:14 +01:00
Rémi Verschelde
85e999dc5e
Merge pull request #64908 from marcinn/lightmap-gi-texel-scale
Add `texel_scale` property to LightmapGI
2024-01-05 12:01:49 +01:00
Gilles Roudière
6bc5b3f812 Move TileMapLayer to its own files 2024-01-05 11:58:21 +01:00
Micky
787f61d70b Add autocompletion for AnimationLibrary's & AnimationMixer 2024-01-04 21:11:36 +01:00
nklbdev
47d991678d Fix lossless formats in PortableCompressedTexture2D
Update scene/resources/portable_compressed_texture.cpp

Co-authored-by: Rémi Verschelde <rverschelde@gmail.com>
2024-01-05 00:11:01 +05:00
Rémi Verschelde
f4059d0e3c
Merge pull request #86576 from bikemurt/no-concave-warnings
Add warning for using concave shape on CharacterBody3D
2024-01-04 16:40:10 +01:00
Rémi Verschelde
5eb22a317d
Merge pull request #83577 from DennisManaa/fix-translation-for-item-list
Add automatic translation of items to ItemList
2024-01-04 16:39:36 +01:00
Rémi Verschelde
8c48e99c17
Merge pull request #82894 from Quimisagi/label-align-values-discarded
Add compatibility rename of `(v)align` properties of `Label`
2024-01-04 16:39:04 +01:00
Rémi Verschelde
b88eddb682
Merge pull request #78378 from 0xafbf/curve-evaluate-correct-transform
Changed the way the rotation of a curve at a point is evaluated to match PathFollow2D
2024-01-04 16:38:38 +01:00
Marcin Nowak
eea2ad4019 Add texel_scale property to LightmapGI 2024-01-04 16:24:19 +01:00
Michael Burt
6838fe3f44 Add warning for using concave shape on CharacterBody3D
Additionally updated descriptions for RigidBody3D and VehicleBody3D
2024-01-04 09:33:01 -05:00
Rémi Verschelde
4a14f9d968
Merge pull request #86754 from Mickeon/autocompletion-spriteframes-animation
Add autocompletion for SpriteFrames' methods
2024-01-04 14:26:37 +01:00
Rémi Verschelde
50a073cb0e
Merge pull request #86732 from TheSofox/line-edit-delete-fix
Make `LineEdit` scrolling show as much text as possible
2024-01-04 14:26:30 +01:00
Rémi Verschelde
6c390b620d
Merge pull request #84445 from Rubonnek/add-const-references-clang-tidy
Add const references detected by clang-tidy
2024-01-04 14:25:33 +01:00
Rémi Verschelde
5d306202b8
Merge pull request #84348 from jsjtxietian/screen-uv-in-visual-shader-preview-should-uv
Fix visual shader's `screen_uv` input preview uses position of node rather than a sample area like uv
2024-01-04 14:25:21 +01:00
Rémi Verschelde
eb830b3484
Merge pull request #72341 from aXu-AP/text_edit_carriage_return_selection
Show selected end of line in TextEdit
2024-01-04 14:24:30 +01:00
Sofox
8661667dde Make LineEdit scrolling show as much text as possible 2024-01-04 04:13:35 +00:00
Micky
c2f9a227f7 Add autocompletion for SpriteFrames' methods 2024-01-03 19:25:28 +01:00
Rémi Verschelde
fbaab3cf53
Merge pull request #86745 from KoBeWi/internal_error
Ignore internal children when replacing node
2024-01-03 15:48:41 +01:00
Rémi Verschelde
5042f543ab
Merge pull request #86460 from reach-satori/double_textchanged_emit
Fix double `text_changed` signal when overwriting selection in LineEdit
2024-01-03 15:47:03 +01:00
Rémi Verschelde
73c5deff76
Merge pull request #82916 from jsjtxietian/update-scene-tree-tooltip-after-editor-description-chnage
Support updating tooltip immediately after editor description change
2024-01-03 15:41:31 +01:00
Rémi Verschelde
0c36bd791d
Merge pull request #82900 from bruvzg/macos_menu_global_shortcuts
[PopupMenu] Handle shortcuts with "global" flag directly.
2024-01-03 15:41:04 +01:00
kobewi
cd2edfef25 Ignore internal children when replacing node 2024-01-03 13:04:16 +01:00
Rémi Verschelde
d822fd5322
Merge pull request #86733 from Mickeon/autocompletion-more-animated-sprite
Add autocompletion options for AnimatedSprite's other play methods
2024-01-03 10:15:01 +01:00
Rémi Verschelde
4acfe4aa3c
Merge pull request #86729 from Mickeon/autocompletion-for-all
Fix missing autocompletion for inheriting classes
2024-01-03 10:14:37 +01:00
Rémi Verschelde
0d922f61e3
Merge pull request #86220 from Sauermann/fix-embed-subwindow
Fix changing `gui_embed_subwindows` while a child window is displayed
2024-01-03 10:13:03 +01:00
Markus Sauermann
62587d2d19 Fix changing gui_embed_subwindows while a child window is displayed
Changing `gui_embed_subwindows` while a child window is displayed can lead
to crashes or other unintended behavior.
This PR adds checks to prevent the change while child windows are
displayed.
2024-01-03 10:09:51 +01:00
Rémi Verschelde
03b1934b63
Merge pull request #86350 from Eoin-ONeill-Yokai/text_resource_parse_error_reporting
Improve error message in text resource format parser
2024-01-03 10:00:43 +01:00
Rémi Verschelde
2d6d726a51
Merge pull request #86227 from TokageItLab/fix-discrete-key-retrieval-after-start
Fix discrete key retrieval method after start
2024-01-03 09:59:55 +01:00
Rémi Verschelde
a6dc1b3907
Merge pull request #84527 from Calinou/colorpicker-display-revert-icon
Display a revert icon on ColorPicker's old sample
2024-01-03 09:59:06 +01:00
Micky
d5a7c7818c Add autocompletion options for AnimatedSprite's other play methods 2024-01-03 01:33:08 +01:00
Micky
ca2f340384 Fix missing autocompletion for inheriting classes 2024-01-03 00:13:04 +01:00
Eoin O'Neill
2283e072b5 Improve error message in text resource format parser
This improves the error message in our text resource parsing code to
help the user potentially fix parsing issues in case of failure. It also
helps with the debugging process of finding out which sub_resource is
causing the parser to fail with line messages.
2024-01-02 14:59:32 -08:00
Silc Lizard (Tokage) Renew
b438e28509 Fix discrete key retrieval method after start 2024-01-03 02:29:00 +09:00
Rémi Verschelde
2f8005cd14
Merge pull request #86601 from TokageItLab/add-cubic-interpolation-variant
Add `cubic_interpolate_in_time_variant()` to Animation
2024-01-02 18:05:55 +01:00
Rémi Verschelde
60b20963ce
Merge pull request #86511 from Sauermann/fix-drag-transform
Fix D&D viewport position calculation
2024-01-02 18:05:23 +01:00
Rémi Verschelde
4566e96839
Merge pull request #82897 from bruvzg/mac_menu_phy_lbl
[PopupMenu] Handle `physical_keycode` and `key_label` of shortcuts.
2024-01-02 18:05:08 +01:00
Rémi Verschelde
957378a69e
Merge pull request #84151 from YeldhamDev/that_was_not_a_resize_you_dunce
Fix `NOTIFICATION_WM_SIZE_CHANGED` firing if the size hasn't changed
2024-01-02 15:08:46 +01:00
EddieBreeg
8747c67d9e
Fix potential integer underflow in rounded up divisions
A new `Math::division_round_up()` function was added, allowing for easy
and correct computation of integer divisions when the result needs to
be rounded up.

Fixes #80358.

Co-authored-by: Rémi Verschelde <rverschelde@gmail.com>
2024-01-02 14:14:47 +01:00
bruvzg
15cdc52658
[PopupMenu] Handle physical_keycode and key_label of shortcuts. 2023-12-30 13:17:46 +02:00
Silc Lizard (Tokage) Renew
e538ce3851 Add cubic_interpolate_in_time_variant() to Animation 2023-12-30 13:30:14 +09:00
kleonc
41e4f3c215 Fix Polygon2D to Skeleton2D transform calculation 2023-12-27 18:46:59 +01:00
Markus Sauermann
4b6516c843 Fix D&D viewport position calculation
It is necessary to transform screen position to viewport position.
2023-12-25 23:32:29 +01:00
Mateus Reis
cab48493d8 Fix double text_changed signal when overwriting selection in LineEdit
The part of gui_input that handles unicode wasn't checking
text_changed_dirty before emitting the signal, unlike the rest of the text editing functions.

Fixes #86451
2023-12-24 14:23:01 +02:00
kobewi
cb0a37f61a Only update particle velocity when it changes 2023-12-23 18:04:24 +01:00
Haoyu Qiu
58db3e5d7b Emit slider's drag_started signal before the first value change 2023-12-21 11:23:35 +08:00
Yuri Sizov
b8635157eb Merge pull request #86218 from TheSofox/arrow-key-scene-tree-nav
Fix `Node` selection when navigating `Tree` with Arrow keys
2023-12-20 15:07:59 +01:00
Yuri Sizov
f77da033f2 Merge pull request #86169 from Repiteo/gdvirtual-call-refactoring
Replace `GDVIRTUAL_CALL` with `GDVIRTUAL_REQUIRED_CALL` where applicable
2023-12-20 15:07:55 +01:00
Yuri Sizov
02bc2a37dd Merge pull request #86118 from TheSofox/complex-undo-select-fix
Fix so undoing complex operations in `TextEdit` will restore selections
2023-12-20 15:07:52 +01:00
Yuri Sizov
40e7192393 Merge pull request #85191 from HolonProduction/off-by-one-code-edit
Fix updating delimiter cache of `CodeEdit` when typing on the first line
2023-12-20 15:07:44 +01:00
Yuri Sizov
3a44484ab8 Merge pull request #83623 from rarysson/label-progressbar-allow-greater
Make ProgressBar reflect the real value in the percent label when "allow greater" is checked
2023-12-20 15:07:30 +01:00
Yuri Sizov
bc6be82f5a Merge pull request #81260 from KoBeWi/min_maxing_particle_editing
Improve editing of min/max particle properties
2023-12-20 15:07:25 +01:00
Yuri Sizov
6296333bad Merge pull request #60965 from DarkMessiah/global-groups-implementation
Implement project-wide node groups
2023-12-20 15:07:20 +01:00
风青山
f19c419126 Fix duplicating sub-scene may get two copies of internal node
Previously, internal node might be mistaken for `hidden_root` and be duplicated again.
Exclude those internal nodes to avoid this case, unless the owner is set intentionally.
2023-12-20 18:29:25 +08:00
kobewi
ce9fec9b4d Improve editing of min/max particle properties 2023-12-20 06:31:08 +01:00
Sofox
4b82cacc21 Fix so undoing complex operations in TextEdit will restore selections. 2023-12-20 00:12:52 +00:00
Yuri Sizov
26834d298d Merge pull request #85652 from rsubtil/bugfix-can_grab_focus
Ensure slider grabs focus only when it can
2023-12-19 20:33:05 +01:00
Yuri Sizov
252c462a9d Merge pull request #85594 from addmix/camera3d-current-bug
Prevent `Camera3D.current` from being set to `true` automatically in the editor.
2023-12-19 20:33:00 +01:00
Yuri Sizov
7182c47309 Merge pull request #85436 from chocola-mint/fix-#85401
Make it possible to show code hint and code completion at the same time
2023-12-19 20:32:50 +01:00
Yuri Sizov
dee2604d99 Merge pull request #84729 from nickyfoo/add-navigationserver-getters
Add missing getters to navigation servers
2023-12-19 20:32:46 +01:00
Yuri Sizov
179b8c7973 Merge pull request #84185 from bruvzg/lbl_char_rects
[Label] Add get_character_bounds method to get bounding rectangles of the characters.
2023-12-19 20:32:39 +01:00
Yuri Sizov
b9dff50282 Merge pull request #83785 from Geometror/graphedit-dotted-grid
Add dotted grid to GraphEdit
2023-12-19 20:32:35 +01:00
Nicholas Foo
e7ee672120 Add getters to navigation servers
Add virtual functions and bind to navigation servers
Implement getters
Add documentation
2023-12-19 19:51:49 +01:00
CHM
3744ef50e4 Make it possible to show code hint and code completion at the same time
Make code completion position more consistent

Add whitespace before if
2023-12-19 19:34:34 +01:00
Stanislav Labzyuk
958699a0c4 Implement project-wide node groups 2023-12-19 18:07:19 +01:00
Yuri Sizov
547374b07a Merge pull request #85473 from miv391/fix-horizontal-mouse-wheeling-in-2d-view
Fix horizontal scroll in editor's 2D view
2023-12-19 13:02:04 +01:00
Yuri Sizov
13dd72ce78 Merge pull request #85219 from dsnopek/light-bake-mode-no-gi-method
Remove GI methods in parentheses from light baking options
2023-12-19 13:01:40 +01:00
Yuri Sizov
02d4579fa2 Merge pull request #85000 from bruvzg/ed_ui_direction
[Editor] Add option to override editor UI layout direction.
2023-12-19 13:01:35 +01:00
Yuri Sizov
1ecba5d341 Merge pull request #84940 from Calinou/editor-textureprogressbar-inspector-hide-properties
Hide ineffective TextureProgressBar properties in the editor
2023-12-19 13:01:30 +01:00
Yuri Sizov
7aae85edfd Merge pull request #84845 from DarkMessiah/tree-disabled-checkbox
Implement disabled state for Checkbox in Tree
2023-12-19 13:01:25 +01:00
Yuri Sizov
5d9dce43bb Merge pull request #84575 from rsburke4/fix-cpu-tangent-force
Fix `CPUParticles2D` tangential force does not match `GPUParticles2D`
2023-12-19 13:01:05 +01:00
Yuri Sizov
8a9aa30348 Merge pull request #81243 from Sauermann/fix-window-events
Fix internal events not being delivered to some Window types
2023-12-19 13:01:00 +01:00
bruvzg
e9c219cff2
[Label] Add get_character_bounds method to get bounding rectangles of the characters. 2023-12-19 13:53:21 +02:00
bruvzg
a759d97a51
[MenuBar] Store and use global menu item indices. 2023-12-19 09:57:48 +02:00
Yuri Sizov
a4d789370f Merge pull request #85966 from Kimau/claire/expose_mouseover
Expose a method to get hovered Control in Viewport
2023-12-18 18:17:57 +01:00
Yuri Sizov
1125235c95 Merge pull request #85749 from bs-mwoerner/color_picker_quantize_fix
Fix unnecessarily quantizing current color in color picker
2023-12-18 18:17:53 +01:00
Yuri Sizov
4600acfc41 Merge pull request #85311 from miv391/add-change-guards-to-sprite2d
Add property change guards to Sprite2D, Sprite3D and AnimatedSprite2D
2023-12-18 18:17:49 +01:00
Yuri Sizov
644e236e5c Merge pull request #83987 from bruvzg/macos_window_and_help
[macOS] Add default Window and Help menus, allow special menu customization.
2023-12-18 18:17:41 +01:00
A Thousand Ships
0081a50e32 Prevent mapping areas with invalid IDs for Area2D/3D
This occurs when areas are created directly from the servers, and no
instance is linked.
2023-12-18 16:02:46 +01:00
Claire Blackshaw
fe7725239e Expose a method to get hovered Control in Viewport 2023-12-18 14:53:52 +01:00
HolonProduction
d5847fa54e Fix updating delimiter cache of CodeEdit when typing on the first line 2023-12-18 14:07:46 +01:00
Michael Wörner
21d778b0c3 Changed HTML input color_changed logic.
Made the HTML field send change events based on whether the new color's string is different from the previous color's string (instead of whether the new string parses to the current color value).
Previously, updating the color value even when the corresponding string hadn't changed would unnecessarily quantize the color value to 8 bits just by opening/closing the Color Picker.
2023-12-17 15:36:57 +01:00
Sofox
f894eb1768 Fixes Node selection when navigating SceneTree with Arrow keys 2023-12-16 19:53:04 +00:00
Wilson E. Alvarez
a3cb1b096f
Add const references detected by clang-tidy 2023-12-16 13:36:44 -05:00
Mika Viskari
5b9e67e0a5 Add property change guards to Sprite2D and AnimatedSprite2D 2023-12-16 20:25:35 +02:00
Yuri Sizov
df9be54b2f Merge pull request #86177 from KoBeWi/depren_never_forgets
Fix file disappearing when renaming dependencies
2023-12-16 17:50:05 +01:00
Yuri Sizov
3fef8910c7 Merge pull request #85575 from TokageItLab/Make-unstore-library
Make unstore AnimationLibrary if AnimationTree is assigned AnimationPlayer
2023-12-16 17:49:43 +01:00
Yuri Sizov
1e86ce0b40 Merge pull request #85317 from miv391/fix-breaking-frame-index-in-sprites
Fix invalid `frame` index when Sprite2D's `hframes` or `vframes` has been changed
2023-12-16 17:49:38 +01:00
Yuri Sizov
486e3a82e8 Merge pull request #84583 from timothyqiu/path-to-ap
Make AnimationTree reference AnimationPlayer instead of AnimationMixer
2023-12-16 17:49:30 +01:00
风青山
ea30aabfb1 Clear monitoring in Area* when its space changes to invalid
So that it can work properly when the space changes to valid again.

Change `space` in advance to prevent disabled areas from being queried again.
2023-12-15 20:54:54 +01:00
Mika Viskari
484c5b5aff Fix invalid frame index when Sprite2D's hframes or vframes has been changed 2023-12-15 20:32:18 +02:00
Haoyu Qiu
7946e84187 Make AnimationTree reference AnimationPlayer instead of AnimationMixer 2023-12-16 00:40:44 +08:00
kobewi
397f0b31e4 Fix file disappearing when renaming dependencies 2023-12-14 22:28:48 +01:00
Yuri Sizov
a5529f759c Merge pull request #86129 from TheSofox/color-picker-memory
Remember last `color_mode` and `picker_shape` in `ColorPicker`s in the editor
2023-12-14 21:22:39 +01:00
Yuri Sizov
302e41c264 Merge pull request #82561 from ershn/fix_navigation_agents_is_target_reached_behavior
Make `target_desired_distance` affect the navigation of `NavigationAgent2D/3D`
2023-12-14 21:22:35 +01:00
Thaddeus Crews
83ef789745
Replace GDVIRTUAL_CALL with GDVIRTUAL_REQUIRED_CALL where applicable 2023-12-14 13:22:40 -06:00
Sofox
7979412c75 Remember last 'color_mode' and 'picker_shape' in 'ColorPicker's in the editor 2023-12-14 18:57:57 +00:00
Yuri Sizov
f79f2ef801 Merge pull request #86065 from bruvzg/non_vis_no_draw
[TextServer] Do not draw non-visual characters.
2023-12-14 17:38:53 +01:00
Yuri Sizov
203c8c31d3 Merge pull request #85071 from Rubonnek/remove-unnecessary-assignments
Remove unnecessary assignments
2023-12-14 17:38:34 +01:00
Yuri Sizov
4cf6325aa1 Merge pull request #84660 from groud/better_tileset_polygons
Move tile transforms handling cache to TileData
2023-12-14 17:38:14 +01:00
Yuri Sizov
16d1d85a56 Merge pull request #78206 from alula/node-count-in-group
Add SceneTree.get_node_count_in_group()
2023-12-14 17:38:00 +01:00
Marius Hanl
18fedd9c13 Fix Popup hover and height calculation are off by some pixels
This was caused by an incorrect calculation of the v_separation where it was not needed
2023-12-14 02:24:25 +01:00
bruvzg
0d44b50520
[macOS] Add default Window and Help menus, allow special menu customization. 2023-12-13 23:20:05 +02:00
Gilles Roudière
18fe0bd025 Move tile transforms handling cache to TileData 2023-12-13 17:44:59 +01:00
Wilson E. Alvarez
80fb8db31f
Remove unnecessary assignments
Co-authored-by: A Thousand Ships <96648715+AThousandShips@users.noreply.github.com>
2023-12-13 11:06:26 -05:00
Rémi Verschelde
7635530e11
Merge pull request #86046 from bs-mwoerner/linear_animation_typemix
Fix linear interpolation not working with mixed (int/float) keyframes
2023-12-13 12:20:38 +01:00
Rémi Verschelde
2d5ceaab3e
Merge pull request #86028 from jsjtxietian/prevent-crash-when-notify-change-empty-tree
Prevent crash when calling `set_text()` on a removed TreeItem
2023-12-13 10:32:48 +01:00
Michael Wörner
12ce2e33b2 Restored the ability for linear interpolation to work on a mix of integer and float keyframes. 2023-12-13 00:24:46 +01:00
bruvzg
575e1201cb [TextServer] Do not draw non-visual characters. 2023-12-12 12:17:10 +02:00
Rémi Verschelde
63f3de3aad
Merge pull request #86056 from ShatReal/fix-skeletonmodification2dtwoboneik-meters
Change suffix of SkeletonModification2DTwoBoneIK from m to px
2023-12-12 10:41:29 +01:00
Rémi Verschelde
5352490cc9
Merge pull request #84384 from zeux/meshopt-update
meshoptimizer: Update to v0.20 (with a reduced patch)
2023-12-12 10:39:28 +01:00
jsjtxietian
7a2831db57 Prevent crash when call set_text() on a removed treeItem 2023-12-12 12:58:14 +08:00
Emily
b7d5f3e984 Change suffix from m to px 2023-12-11 16:52:03 -08:00
Rémi Verschelde
15a03ed98e
Merge pull request #86034 from kleonc/color_picker_alpha_slider_fix_arrow_offset
Fix `ColorPicker`'s alpha slider arrow offset
2023-12-12 00:34:37 +01:00
Rémi Verschelde
e1d4b3cc07
Merge pull request #85794 from TokageItLab/stablemixer
Remove differences of the code between old AnimationTree and AnimationMixer
2023-12-12 00:33:01 +01:00
Rémi Verschelde
1f3c16dd1c
Merge pull request #85001 from alesliehughes/anim_mixer_leak
Replace memory allocation point of ValueTrack correctly in AnimationMixer
2023-12-12 00:18:31 +01:00
Rémi Verschelde
4450ae98b9
Merge pull request #84969 from alesliehughes/shader_refactor
VisualShader: Refactor use of Connection
2023-12-12 00:18:07 +01:00
Rémi Verschelde
4943b6e6b3
Merge pull request #84451 from ShirenY/FixSkeletonMeshCulling
Transform mesh's AABB to skeleton's space when calculating mesh's bounds
2023-12-12 00:16:51 +01:00
Rémi Verschelde
5529d32b56
Merge pull request #83938 from clayjohn/sky-exposure
Expose `energy_multiplier` to remaining SkyMaterials
2023-12-12 00:16:25 +01:00
Rémi Verschelde
4e2350b1af
Merge pull request #82661 from bruvzg/custom_ellipsis
[Text Overrun] Add option to set custom ellipsis character, add support for system font fallback.
2023-12-12 00:15:34 +01:00
Alistair Leslie-Hughes
bfd62d7cdf Visual shader refacter use of connection 2023-12-12 07:36:28 +11:00
Alistair Leslie-Hughes
ea84effb84 Replace memory allocation point of ValueTrack correctly in AnimationMixer
When a animation track doesn't have an keys, it's possible that we leak memory due the ERR_CONTINUE_MSG macro usage.

By checking the error condition first, we avoid a allocation and thus the leak.
2023-12-12 07:33:35 +11:00
kleonc
d76d8c5f29 Fix ColorPicker's alpha slider arrow offset 2023-12-11 16:17:45 +01:00
ShirenY
27f71c4e78 Transform mesh's AABB to skeleton's space when calculate mesh's bounds. 2023-12-09 11:41:15 +08:00
Yuri Sizov
b94eb58d35 Merge pull request #85893 from groud/fix_tilemap_occluders
Fix TileMap occluders
2023-12-08 18:46:08 +01:00
Yuri Sizov
6269341461 Merge pull request #85054 from miv391/highlight-minimap-error-lines
Highlight error lines in minimap
2023-12-08 18:45:54 +01:00
Yuri Sizov
07677f0f51 Merge pull request #85885 from YuriSizov/bench-pressing
Improve engine startup/shutdown benchmarks
2023-12-08 17:12:26 +01:00
Yuri Sizov
9cd9831883 Merge pull request #82887 from aaronfranke/capsule-cylinder-rings
Reduce minimum capsule/cylinder mesh rings to 0
2023-12-08 16:57:58 +01:00
Yuri Sizov
dcbb18ded8 Merge pull request #85313 from kitbdev/fix-exit-hide
Fix crash on hiding grandparent Control on mouse exit
2023-12-08 15:23:32 +01:00
Yuri Sizov
44d544fc98 Merge pull request #85120 from dsnopek/gl-lightmap
OpenGL: Implement rendering of lightmaps
2023-12-08 15:23:27 +01:00
Yuri Sizov
6c86974022 Merge pull request #84122 from kitbdev/fix-dock-visibility
Fix dock visibility issues
2023-12-08 15:23:09 +01:00
Yuri Sizov
de5583c821 Merge pull request #83698 from BlueCube3310/curve-runtime-draw-improvement
Improve Curve3D debug drawing
2023-12-08 15:23:03 +01:00
Yuri Sizov
13305d31b5 Merge pull request #83343 from warriormaster12/node-property-duplication
Fix export variable of type Node pointing to a wrong child node when duplicating
2023-12-08 15:22:59 +01:00
Yuri Sizov
ae4e48246a Merge pull request #80994 from aitorciki/zoom-from-pan-gesture
Trigger zoom from pan gestures when pressing ctrl
2023-12-08 15:22:43 +01:00
Yuri Sizov
b6c15736bd Merge pull request #78997 from Sauermann/fix-owner-crash
Fix crash caused by stale owner
2023-12-08 15:22:39 +01:00
Yuri Sizov
fc3f40f37d Improve engine startup/shutdown benchmarks
- Add contexts to give a better sense of benchmarked areas.
- Add missing benchmarks and adjust some begin/end points.
- Clean up names.
- Improve Android's internal benchmarks in a similar manner.

Co-authored-by: Fredia Huya-Kouadio <fhuya@meta.com>
2023-12-08 12:53:04 +01:00
Gilles Roudière
fcb8d19de0 Fixes TileMap occluders 2023-12-08 10:07:28 +01:00
Mika Viskari
609eb8bc01 Highlight error lines in minimap 2023-12-07 16:26:08 +02:00
David Snopek
bfdcd8559b Fix overriding CollisionObject3D::_mouse_enter() and _mouse_exit() from GDExtension 2023-12-06 16:39:43 -06:00
bruvzg
f9c42d9fff
Limit window size updates on title translation change. 2023-12-06 10:51:27 +02:00
Aaron Franke
6ee9edb946
Reduce minimum capsule/cylinder mesh rings to 0 2023-12-05 22:27:23 -06:00
Silc Lizard (Tokage) Renew
5acf6b4ca6 Remove differences of the code between old AnimationTree and Mixer 2023-12-06 02:29:29 +09:00
Rémi Verschelde
36e033bce8
Merge pull request #85312 from YuriSizov/window-and-the-case-of-an-unexpected-shrinkage
Make sure `Window`'s title is respected before we compute the size
2023-12-05 13:05:23 +01:00
David Snopek
749f60ee36 OpenGL: Implement rendering of lightmaps 2023-12-04 18:34:06 -06:00
Rémi Verschelde
654132cb9c
Merge pull request #85753 from groud/allow_invisible_scene_tiles
Keep scene tiles even if the TileMap is invisible
2023-12-04 23:29:33 +01:00
Rémi Verschelde
1d520f5d11
Merge pull request #85681 from KoBeWi/continue_but_not_now
Fix Tween loop initial value
2023-12-04 23:21:34 +01:00
Rémi Verschelde
6a10b99228
Merge pull request #85631 from Malcolmnixon/gltf-convex-decomposition
Fix memory corruption and assert failures in convex decomposition
2023-12-04 23:20:23 +01:00
Rémi Verschelde
b8ba602e8c
Merge pull request #85569 from TokageItLab/fix-seek-diecrete
Fix AnimationPlayer seeking for Discrete keys
2023-12-04 23:19:58 +01:00
Rémi Verschelde
e6d83058b9
Merge pull request #85542 from bruvzg/win_title_upd
Limit window size updates on title change.
2023-12-04 23:15:42 +01:00
Rémi Verschelde
6b21a185e2
Merge pull request #85428 from jsjtxietian/prevent-nullptr-crash-in-AnimationMixer--restore
Prevent a crash when calling `AnimationMixer::restore` with an invalid resource
2023-12-04 23:14:29 +01:00
Rémi Verschelde
8580874d0f
Merge pull request #85363 from bruvzg/rtl_fx_nl
[RTL] Fix CharFX character offset calculation.
2023-12-04 23:12:48 +01:00