Commit Graph

1836 Commits

Author SHA1 Message Date
Noshyaar a6328011d8
Merge pull request #14973 from poke1024/docs-word-selection
Double-click word selection for RichTextLabel (i.e. docs)
2018-01-01 18:51:35 +07:00
Noshyaar 2154f82302
Merge pull request #15152 from poke1024/editor-settings-change
Only send editor "settings_changed" if actually changed
2018-01-01 18:48:33 +07:00
Noshyaar 9186047767
Merge pull request #15111 from poke1024/fix15097
Fixes various Line2D and Polygon2D editor bugs
2018-01-01 18:46:33 +07:00
Noshyaar 6aae9affec
Merge pull request #15080 from volzhs/text-color
Respect text editor highlighting color changes
2018-01-01 18:46:05 +07:00
Noshyaar 0ac7c0b1af
Merge pull request #15101 from nounoursheureux/master
Make filesystem search case-insensitive
2018-01-01 18:42:37 +07:00
Ryan Stein 67c158fe9f Move Project Manager favorite icon back to center. 2017-12-31 19:58:17 -05:00
volzhs 0341070cde Fix duplicating file or folder
Fix #15206
2018-01-01 05:03:20 +09:00
volzhs 4d0097e8ae Copy resource with specific extension
Fix #15169
2018-01-01 02:35:46 +09:00
volzhs 108b4a37b0 Fix lock or group with invisible node
Fix #15205
2018-01-01 02:18:39 +09:00
firefly2442 9ba9e37220 prevent strings from being evaluated to just "true" 2017-12-30 21:22:16 -07:00
Bernhard Liebl 86154c4c69 Various fixes for 2d polygon editor
Fixes issues 15096, 15097
Fixes various other Line2D edit issues
Fixes previous outline
Fixes retina support
2017-12-30 17:51:53 +01:00
Ruslan Mustakov ab12a5cf8e Perform export after import is fully complete
Previously command line export would go simultaneously with reimport,
which caused final package to either miss something or contain
outdated assets or perhaps even broken ones.
2017-12-30 16:39:09 +07:00
geequlim bd0a9f4bd6 Fix errors with custom default theme and custom fonts. 2017-12-30 17:30:37 +08:00
Noshyaar 47810cbaea
Merge pull request #15117 from damarindra/master
Autotile Enhancement
2017-12-29 19:14:12 +07:00
Bernhard Liebl 62f3af9de1 Only send editor "settings_changed" if actually changed. 2017-12-29 11:03:29 +01:00
Juan Linietsky f11a138505 Added more hacks to GLTF2 importer to support crap exporter (MakeHuman in this case), fixes #13393 2017-12-28 16:07:45 -03:00
damarindra e850360948 Autotile Enhancement 2017-12-28 23:57:23 +07:00
Bernhard Liebl b80bc553dd Double-click word selection for RichTextLabel (i.e. docs) 2017-12-28 17:44:22 +01:00
volzhs 4b0f075e95 Respect text editor highlighting color changes
Fix #14838
2017-12-28 23:49:15 +09:00
Noshyaar 7f1265b41f
Merge pull request #15104 from djrm/pr_visual_improvements
Minor style fixes for editor help
2017-12-28 07:01:41 +07:00
Bernhard Liebl 8505871a87 More exact picking for canvas editor 2017-12-27 20:24:58 +01:00
Juan Linietsky 988d29bdd8 Reimport now checks source path changes and imported files and their md5, fixes #14728 2017-12-27 15:22:04 -03:00
Michael Alexsander Silva Dias 0930f4cbcb Changes to the Project Manager's New Project/Export dialogs. 2017-12-27 16:13:13 -02:00
Daniel J. Ramirez fec41618dc Minor style fixes for editor help 2017-12-27 10:35:26 -06:00
Wilhem Barbier 03beb9ac7d Make filesystem search case-insensitive 2017-12-27 15:49:19 +00:00
Noshyaar e6b6683694
Merge pull request #14991 from djrm/pr_fixes
Show Options Dialog for NodePath and File in clicked button position.
2017-12-27 10:29:25 +07:00
Noshyaar 4bf1d3afbf
Merge pull request #15028 from YeldhamDev/editor_file_dialog_changes
Changes to the Editor File Dialog
2017-12-27 10:27:06 +07:00
Noshyaar e2a091e600
Merge pull request #15032 from Noshyaar/pr
EditorAbout: TTR workaround for "Project Manager" contexts
2017-12-27 10:26:03 +07:00
Noshyaar d5f92c2baa
Merge pull request #15081 from volzhs/fix-status-font
Fix text editor status font
2017-12-27 10:17:53 +07:00
volzhs 056bc123f8 Fix text editor status font
mistake from https://github.com/godotengine/godot/commit/15986ea343#diff-e7b153431ed956907f3ee3ef07ac59dd
2017-12-27 06:09:28 +09:00
Juan Linietsky 57061413eb Properly rename scenes and resources after renaming or moving files, should fix #13976
It's not tested, so please test.
2017-12-26 16:32:12 -03:00
volzhs 2c8ebab93b Use .ttf or .otf file for editor custom font 2017-12-27 03:14:48 +09:00
Gilles Roudiere b8c849205c Fix 2D editor checkboxes with a new project 2017-12-26 16:39:58 +01:00
Bernhard Liebl 77b4256718 Add keyboard shortcut for Clear Output 2017-12-26 11:41:38 +01:00
Bernhard Liebl 3f122672a2 On macOS, change some default editor shortcuts 2017-12-26 11:24:12 +01:00
Poommetee Ketson 6c897707ca Add missing parameter names 2017-12-25 21:19:56 +07:00
volzhs cc1d56e3ff Fix popup menu size in Inspector dock 2017-12-25 19:31:53 +09:00
Poommetee Ketson bfd8047e13 EditorAbout: TTR workaround for "Project Manager" contexts 2017-12-25 15:02:54 +07:00
Michael Alexsander Silva Dias ecf3fbadf4 Changes to the Editor File Dialog. 2017-12-25 02:29:00 -02:00
Noshyaar 256a60bc6e
Merge pull request #14826 from carlosfvieira/14371-F_key_Viewport_focus_problem
Fix spatial editor plugin issues on multi viewport view menu shortcuts (only those that are bound to keys)
2017-12-25 08:42:31 +07:00
Noshyaar aecffd71d8
Merge pull request #14847 from YeldhamDev/3d_viewport_save
Fixes for the Spatial Editor's Perspective options and dead code cleaning
2017-12-25 08:40:43 +07:00
Noshyaar deda8974df
Merge pull request #14853 from MattUV/context-menu
Adds an option to move cursor with right click in TextEdit
2017-12-25 08:40:20 +07:00
Noshyaar 5859db00d8
Merge pull request #14846 from carlosfvieira/weird_gizmo_ortho
Fixes gizmo huge scale immediately after change to orthogonal view
2017-12-25 08:39:08 +07:00
Noshyaar c9c1bc7a73
Merge pull request #14732 from AndreaCatania/jgizmo
Fixed joint gizmos drawing orientations
2017-12-25 08:32:55 +07:00
Noshyaar b6c798a062
Merge pull request #14827 from RayKoopa/editor_patchwork
Some Editor UI patchwork
2017-12-25 08:28:53 +07:00
Noshyaar 3f193af893
Merge pull request #14808 from YeldhamDev/script_editor_fixes
Some fixes for the Script Editor and dead code cleaning.
2017-12-25 08:27:38 +07:00
Noshyaar 3e4836567b
Merge pull request #14908 from YeldhamDev/dialog_changes
Fixes and modifications for some dialogs
2017-12-25 08:23:06 +07:00
Daniel J. Ramirez e7b24c648c Added default close and title color to editor themed graph nodes 2017-12-24 13:08:53 -06:00
Daniel J. Ramirez 07fd5456c8 Show Options Dialog for NodePath and File in clicked button position.
Auto select newly created nodes.
2017-12-23 15:15:48 -06:00
geequlim 52ad2e5418 Add more translatable text for editor plugins. 2017-12-23 22:40:15 +08:00
AndreaCatania eb32c4b5d2 Fixed joint gizmos orientations 2017-12-23 15:19:03 +01:00
Poommetee Ketson 9fd7aec2b4 ProjectManager: enhance dialog ok button text 2017-12-23 09:06:03 +07:00
Michael Alexsander Silva Dias 68a6edfd1b Fixed right dock dragger not disappearing when there is no docks there. 2017-12-22 17:12:13 -02:00
Rémi Verschelde 3068ccc8e6
Merge pull request #14913 from poke1024/tooltip-shortcut-names
Consistent display of shortcut names in tooltips
2017-12-21 22:47:50 +01:00
poke1024 22d87f20fa Consistent display of shortcut names in tooltips 2017-12-21 20:17:30 +01:00
volzhs d9e5be1d66 Fix open directory in FileSystem dock 2017-12-22 04:16:04 +09:00
Michael Alexsander Silva Dias e86454fb38 Fixes and modifications for some dialogs. 2017-12-21 15:26:46 -02:00
Juan Linietsky 1fa9aac3e4 -Make capture dependent on a cell size, not subdivision.
-Fixed a bug recently introduced when releasing mouse events and calling popups
2017-12-21 11:05:55 -03:00
carlosfvieira 49859871d9 Fix spatial editor plugin issues on multi viewport view menu shortcuts (only those that are bound to keys) - this closes #14371 and closes #12409
Fix spatial editor plugin issues on multi viewport view menu shortcuts (only those that are bound to keys) - this closes #14371 and closes #12409
2017-12-21 11:29:17 +00:00
Will Nations 1408fab1b4 Plugins can select files in FileSystem Dock 2017-12-20 16:34:21 -06:00
Rémi Verschelde 0b1e6ec219
Merge pull request #14874 from volzhs/blurry-zoom
Fix blurry after zooming
2017-12-20 22:19:16 +01:00
Rémi Verschelde 03823f12c5 EditorSettings: Move scene tab options to their dedicated category
Fixes #14870.
2017-12-20 19:41:02 +01:00
Rémi Verschelde acf835cb08 i18n: Sync translation templates with current source 2017-12-20 17:10:28 +01:00
Rémi Verschelde a27b57829e i18n: Sync translations with Weblate
Adds Icelandic and Tamil.
2017-12-20 17:08:48 +01:00
volzhs ec139d8522 Fix blurry after zooming 2017-12-21 00:39:02 +09:00
MattUV a55870cd81 Adds an option to move cursor with right click in TextEdit
Fixes #14832
- Added an option in the editor settings/cursor to make the cursor move with right click.
- If the option is activated (true by default), a right click will move the cursor before displaying context menu.
 - If there is a selection, a right click on it will keep it selected, a right click outside it will unselect it.
 - The option is available in textEdit via an inspector property (or via GDScript): caret_moving_by_right_click
 - The option is available in the script editor and the shader editor via the editor settings
 - The documentation has been updated with the new property, and a few other entries in TextEdit.xml.
2017-12-20 09:01:09 +01:00
Michael Alexsander Silva Dias 2490c4d882 Fixes for the Spatial Editor's Perspective options and dead code cleaning. 2017-12-20 01:05:21 -02:00
Carlos Vieira 2a3f6ee8b3 #14619 - fixes issue 1 (gizmo huge scale) - also referred in #14836 2017-12-19 23:45:10 +00:00
Juan Linietsky bf47b15e2c Good while it lasted, restored full 3D for 2D viewport, as required for Canvas BG mode. Fixes #14540 2017-12-19 15:59:32 -03:00
Ray Koopa 69ef89a8bd Limit code editor minimum width, clear Scene node subresource menu before refilling it 2017-12-19 18:29:01 +01:00
Juan Linietsky a714e1a4c7 Fixed bug where all file dialogs requested thumbnails even if hidden. 2017-12-19 12:57:46 -03:00
Juan Linietsky 1eb1837d0c Should no longer crash after rebaking, may be a solution to #14795
Not sure if this is the same problem, as reported, please test.
2017-12-19 09:58:02 -03:00
Guilherme Felipe 8adf7c3ef2 Add method_descr again because it's required for classes that
don't have public methods. revert #14814
2017-12-18 22:47:17 -02:00
Guilherme Felipe 5c0271eed7 Fix doc methods not showing up 2017-12-18 20:35:15 -02:00
Rémi Verschelde d81bd965b6 Fix bug in previous commit 2017-12-18 20:59:32 +01:00
Rémi Verschelde 2a30f0460d Prevent infinite loop in export template manager 2017-12-18 20:44:19 +01:00
Onur Aslan 4440900672 Fix installing export templates from file
3de20641f5 did break installing export
templates from file. This patch is fixing it.
2017-12-18 21:08:27 +03:00
Michael Alexsander Silva Dias 36e835bbd4 Some fixes for the Script Editor and dead code cleaning. 2017-12-18 15:46:17 -02:00
Juan Linietsky b3a1bf3245 Use a different strategy for path remaps, try loading from a remap file instead.
This ensures multiple PCK exports still work.
2017-12-18 11:21:49 -03:00
volzhs 59564f267c Fix "selection_changed" called twice 2017-12-18 22:14:37 +09:00
Rémi Verschelde abf20709af doc: Sync classref with current source 2017-12-18 08:13:58 +01:00
Dmitry Koteroff ea14b0789b A few small Debugger->Errors tab enhancements:
1. Added "Clear" button to clear list.
2. Errors list now populated with newest items comes first, so no need to scroll everytime.
3. Added PopupMenu to errors list with ability to quickly Copy error text & details.
2017-12-18 03:40:49 +03:00
Rémi Verschelde e83c502939
Merge pull request #14754 from willnationsdev/dictionary-copy
Added 'duplicate' function for Dictionary in C++ and API.
2017-12-17 23:58:59 +01:00
Will Nations f19fc83546 Dictionary::copy -> ::duplicate 2017-12-17 16:07:15 -06:00
Rémi Verschelde 27642868f1
Merge pull request #14786 from djrm/pr_fixes
Expose Range, ScrollBar and Slider as virtual.
2017-12-17 22:21:06 +01:00
Rémi Verschelde 19a8f409c1
Merge pull request #14782 from djrm/pr_visual_improvements
Now every variant type has its icon.
2017-12-17 22:19:44 +01:00
Rémi Verschelde cd6fb0eb4e
Merge pull request #14779 from RayKoopa/setting_ui_design
Implement settings dialog UI ideas
2017-12-17 22:19:04 +01:00
Daniel J. Ramirez 5e2c8593f7 Expose Range, ScrollBar and Slider as virtual. 2017-12-17 15:16:20 -06:00
Daniel J. Ramirez c8c280a68a Now every variant type has its icon. 2017-12-17 14:06:11 -06:00
Rémi Verschelde 4ee57026bb
Merge pull request #14781 from djrm/pr_visual_improvements
General use Variant type icons, plus other icon updates.
2017-12-17 20:21:48 +01:00
Daniel J. Ramirez 756c033adb General use Variant type icons, plus other icon updates. 2017-12-17 13:19:09 -06:00
Rémi Verschelde 3ce5a74df2
Merge pull request #14770 from volzhs/sub-resources
Show sub-resources as sub-menu
2017-12-17 20:02:41 +01:00
Juan Linietsky 3de20641f5 Property install export templates when downloaded from http
added a scale parameter for scene import
2017-12-17 15:48:24 -03:00
George Marques c8d416d152
Fix method not returning value in all paths (autotile editor) 2017-12-17 16:03:46 -02:00
Ray Koopa 0d04f212a3 Clean up setting dialogues a bit. 2017-12-17 18:39:36 +01:00
Juan Linietsky fa8a1fc420 Fixes how transform is applied to geometry in UV unwrap 2017-12-17 12:04:54 -03:00
volzhs 002a0271fe Show sub-resources as sub-menu 2017-12-17 23:55:24 +09:00
Rémi Verschelde 8f25a2dc11 Cleanup some #if 0'd code 2017-12-17 15:40:24 +01:00
Rémi Verschelde 93c9aada67
Merge pull request #14692 from poke1024/docsgroups
Docs methods grouping by prefix
2017-12-17 14:23:49 +01:00
volzhs 4073de88cb Refactoring FPS & information on 3D viewport
- FPS label position adjusted with Preview button
- Remove unnecessary Panel control
- Remove unnecessary check condition
2017-12-17 21:49:44 +09:00
poke1024 9cfc4440c1 Docs methods grouping by prefix 2017-12-16 20:02:10 +01:00
Rémi Verschelde a7f09b71f9
Merge pull request #14743 from volzhs/unnecessary-update-files
Remove unnecessay update on FileSystem dock
2017-12-16 16:35:18 +01:00
volzhs c3d18aed8c Remove unnecessay update on FileSystem dock 2017-12-16 23:53:44 +09:00
Przemysław Gołąb (n-pigeon) b3575b5164 Moved Local Space Mode and Transform Snap settings to Top Bar ...
...buttons for easier access.
2017-12-16 15:42:19 +01:00
Juan Linietsky 92a8a505a0
Merge pull request #14739 from volzhs/collapse_folder
Enhance FileSystem dock
2017-12-16 11:33:16 -03:00
volzhs 15e77b3b60 Enchance FileSystem dock
* Collapse / Uncollapse folder with double click
* Sync with tree and bottom panel
* Show selected folder in tree when changed
2017-12-16 23:26:43 +09:00
Rémi Verschelde 3adae8599c
Merge pull request #14698 from carlosfvieira/6382-Properties_in_the_inspector_lacking_tooltips
Proposed change to close issue "#6382 - Properties in the inspector lacking tooltips"
2017-12-16 15:05:09 +01:00
Rémi Verschelde a68d15d509
Merge pull request #14597 from NathanWarden/linux_extensions
Updated Linux template extensions to match architecture.
2017-12-16 13:05:18 +01:00
Rémi Verschelde b07049faea
Merge pull request #14682 from sersoong/master-batchchange
Enhanced changeType menu in Scene Tree Dock
2017-12-16 10:59:17 +01:00
Rémi Verschelde 9b334389a2
Merge pull request #14702 from YeldhamDev/property_multiline
Made multiline property editor deselect text when opening
2017-12-16 10:49:21 +01:00
sersoong a2981f555a Enhanced changeType menu in Scene Tree Dock 2017-12-16 09:53:24 +08:00
Michael Alexsander Silva Dias e73486aed4 Made multiline property editor deselect text when opening. 2017-12-15 22:46:36 -02:00
carlosfvieira 30acd5f834 closes godotengine/godot#6382 - traverse classes docs so that all properties from inherited classes have tooltips accordingly 2017-12-16 00:24:39 +00:00
Rémi Verschelde a5db25bd27
Merge pull request #14551 from volzhs/ok-alert-confirm
Pressing Enter key creates or loads script on Attach script window
2017-12-16 01:17:45 +01:00
Rémi Verschelde 03fb1fd7fa
Merge pull request #14613 from voithos/fold-jump-bugfix
Account for folded code blocks when navigating via members list
2017-12-16 01:16:25 +01:00
Rémi Verschelde 2e21a427ee
Merge pull request #14609 from sersoong/master-test
Enhanced Merge From Scene
2017-12-16 01:16:01 +01:00
Rémi Verschelde 3caa18f02a
Merge pull request #14630 from willnationsdev/script-editor-create-api
Add API for ScriptEditor to open ScriptCreateDialog
2017-12-16 01:15:20 +01:00
Rémi Verschelde 1a065772d6
Merge pull request #14623 from volzhs/mesh-menu-theme
Fix theme for Mesh menu
2017-12-16 01:14:53 +01:00
Rémi Verschelde ef1e2df86d
Merge pull request #14645 from volzhs/focus-after-select
Focus path field after seleting file browser on Attach script window
2017-12-16 00:47:15 +01:00
Rémi Verschelde 76af59ee5e
Merge pull request #14649 from MattUV/fix-indentation
Modifies text indentation behaviour
2017-12-16 00:41:59 +01:00
Rémi Verschelde f73f10dd7e
Merge pull request #14652 from hoelzl/pr-moved-instanced-children
Prevent users from moving instanced children
2017-12-16 00:38:52 +01:00
Juan Linietsky e946fb8cb0 Made built-in identifiers properly constant in shaders. Fixes #14449, closes #14629 2017-12-15 18:24:30 -03:00
Andreas Haas 0de3cde6fc
ScriptCreateDialog: Fix loading scripts with named classes.
We only need to validate the class name when creating a new script, existing scripts already have one.

Fixes #14643
Supersedes/Closes #14684
2017-12-15 19:40:36 +01:00
Juan Linietsky 251433847f -Added new scene conversion to binary on export (disabled by default, please test)
-This method works by directly converting text to binary, so the scene does not need to be loaded and saved
2017-12-15 08:39:26 -03:00
MattUV db020f3cea Modifies indentation behaviours
Partially fixes #14559 (see the issue for details);
Removes some code redondancy ;
Adds the possibility to indent left and right without selecting text ;
Adds the entries to the context menu when text is not selected ;
Renames indent_selection_left() and indent_selection_right() to indent_left() and indent_right() ;
Unifies context menus of shader text editor and script text editor.
2017-12-15 10:04:56 +01:00
Daniel J. Ramirez dcad7042dc Updated icons
[ciskip]
2017-12-14 15:49:27 -06:00
Juan Linietsky 93a63a5e1a GDScript files are converted to binary on export now. 2017-12-14 15:34:47 -03:00
Matthias Hoelzl ce24b149d3 Prevent users from moving instanced children 2017-12-14 17:49:02 +01:00
Juan Linietsky f3ad14224e -Add lightmapper
-Fixes to unwrapper (remove degenerates), makes Thekla not crash
-Added optional cancel button in EditorProgress
-Added function to force processing of events (needed for cancel button)
2017-12-14 09:01:27 -03:00
Will Nations c38cd9b963 Added open_script_create_dialog func 2017-12-13 22:14:17 -06:00
volzhs ac411c9f48 Focus path field after seleting file browser on Attach script window 2017-12-14 11:25:00 +09:00
Andreas Haas 34e489f060
TileMapEditor: Fix tile placement.
Fixes #14625
2017-12-13 16:46:22 +01:00
volzhs e8cc25a855 Fix theme for Mesh menu 2017-12-13 21:26:55 +09:00
Rémi Verschelde b0aeecc02b
Merge pull request #14596 from Noshyaar/pr
Enhance undoredo action name, TTR, cleanup
2017-12-13 08:36:47 +01:00
Zaven Muradyan f139d0e4e6 Account for folded code blocks when navigating via members list
Previously, the editor would attempt to set the scroll position to the
function's line number, but this would result in an invalid scroll
whenever functions above the target were folded.

This changes callback to use a combination of `goto_line` and
`set_edit_state` to navigate to the target line and reset the cursor to
column 0.

Using `goto_line` also has the side effect of automatically unfolding
the target function, which seems like useful behavior.

Fixes #14572.
2017-12-12 21:40:12 -08:00
sersoong 2c7131e5ac Enhanced Merge From Scene 2017-12-13 12:38:35 +08:00
Nathan Warden f89d78a7a4 Updated Linux template extensions to match architecture. 2017-12-12 16:09:48 -05:00
Michael Alexsander Silva Dias a933b927ca Fixed Tileset editor button having the wrong text and not being translatable. 2017-12-12 17:06:44 -02:00
Poommetee Ketson 24df9f3707 Enhance undoredo action name, TTR, cleanup 2017-12-12 23:04:37 +07:00
Poommetee Ketson 9888a56639 Change statable to multistate, remove extra separator 2017-12-12 09:41:17 +07:00
volzhs 47182a01c3 Pressing Enter key creates or loads script on Attach script window 2017-12-11 23:20:25 +09:00
Ray Koopa d0ebcb61c8 Highlight Editor Settings categories 2017-12-11 13:13:17 +01:00
Rémi Verschelde dfb3634c34
Merge pull request #13836 from AndreaCatania/scale
Fixed bullet scale on get_transform and joints
2017-12-11 10:35:09 +01:00
Rémi Verschelde 378bb89678
Merge pull request #14541 from volzhs/fix-checkbutton
Fix CheckButton & CheckBox minimum size
2017-12-11 08:01:54 +01:00
Rémi Verschelde 82b702d5da
Merge pull request #14533 from Krakean/addrootifnone_fix
Fix to #14503
2017-12-11 07:44:33 +01:00
volzhs 3c04d7798c Fix CheckButton minimum size 2017-12-11 14:52:32 +09:00
Dmitry Koteroff cd43188734 Fixed #14503 2017-12-11 02:43:27 +03:00
Rémi Verschelde 50fab3dc1a
Merge pull request #14518 from poke1024/fix-player-wpos
Fix player window centering on macOS retina screens
2017-12-11 00:12:18 +01:00
Stefano Bonicatti cad2fc7ba9 Fix SceneTreeEditor crashing when calling _deselect_items
The crash can be triggered for instance by trying to reparent a node
and clicking on the background of the Reparent Node window.
2017-12-10 22:41:54 +01:00
Bernhard Liebl e161c47677 Fix player window centering on macOS retina screens 2017-12-10 18:28:08 +01:00