maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
13351 commits 10 branches 35 tags 1.1 GiB
Commit graph

3266 commits

Author SHA1 Message Date
Rémi Verschelde 9247f2de37
Merge pull request #16249 from binbitten/fix-highlight-ofs 
Fix TextEdit current line highlight horizontal offset
 2018-02-01 15:25:02 +01:00
Rémi Verschelde ff287d8341
Merge pull request #15254 from mrcdk/pitch_scale 
Added pitch scale property to AudioStreamPlayer, AudioStreamPlayer2D and AudioStreamPlayer3D
 2018-02-01 14:26:27 +01:00
binbitten ba8c5bff69 Fix TextEdit current line highlight horizontal offset 2018-01-31 19:04:50 +01:00
George Marques b80bc73a17
Expose a few GraphEdit methods to script languages 2018-01-30 22:09:41 -02:00
Juan Linietsky 1322ca6fb2 Ability to import .escn files, which is just a .tscn but with forced import. 
This works together with the new Blender to Godot exporter.
 2018-01-30 11:04:22 -03:00
Rémi Verschelde d1954f464c
Merge pull request #16152 from hpvb/fix-16131 
Allow focus on disabled buttons
 2018-01-30 13:44:28 +01:00
Rémi Verschelde ed6bf28014
Merge pull request #15980 from mrcdk/audio_stream_get_length 
Expose audio streams get_length()
 2018-01-30 13:43:34 +01:00
Hein-Pieter van Braam 713f190a30 Allow focus on disabled buttons 
This behavior better matches other gui toolkits. A selected disabled
button still can't be interacted with but it can now be selected. This
seems to be what QT and GTK do also.

This fixes #16131
 2018-01-28 18:49:22 +01:00
robfram 3cf2d6524b Fix inverted RIGHT/LEFT TOP/BOTTOM Camera2D drag margin in runtime (editor works fine). Fix #16095. 2018-01-27 19:37:04 +01:00
Bojidar Marinov 57bed14e95
Remove duplicate "autoplay" property 
Part of #16051
 2018-01-25 16:17:35 +02:00
Paul Joannon e30aa1386c
update signals' MethodInfo in Tween 
key is a NodePath, not a String
 2018-01-23 13:06:03 +01:00
Todd Ross fd6a98b753 defend Path2D against a null curve 2018-01-22 22:45:38 -06:00
MrCdK 8a9f1c2a5d Expose audio streams get_length() 2018-01-22 20:35:33 +01:00
Rémi Verschelde 37cb029fcc
Merge pull request #15938 from poke1024/fix15904 
Fix crash on deleted rigidbodies without contact monitor (issue 15904)
 2018-01-22 00:02:14 +01:00
Rémi Verschelde e1f34249eb Fix typo in CollisionObject warning 2018-01-21 21:32:00 +01:00
Juan Linietsky 8daf5491ab I have no idea why this commit fixes #15392 2018-01-21 16:19:35 -03:00
Mariano Suligoy 517ff5c8d7 attemp to fix #15870 2018-01-21 12:31:59 -03:00
Bernhard Liebl e9237d83c7 Fix crash on deleted rigidbodies without contact monitor (issue 15904) 2018-01-21 12:46:13 +01:00
robfram d588fe2740 Fix issue 15895, audio streams don't signalling finished after the first one 
if the audio player is set to play again due to the order of calls in
_notification. First it emits the signal, and later it disable the internal
processing regardless what the callback did.

Changed to emit the signal at the end to ensure the changes done at callback
remains.
 2018-01-20 22:22:00 +01:00
Gilles Roudiere 30e1e42175 Fixes a bas resizing with SplitContainer 2018-01-20 21:03:20 +01:00
Yuri Chornoivan 17614f79ea
Fix minor typo: it's -> its 2018-01-20 20:18:43 +02:00
Gilles Roudiere d1f32708b7 Fixes a Gridcontainer wrong children fitting with expanded+non-zero minisize 2018-01-19 00:56:30 +01:00
MrCdK 9927b70efb The TextureButton's bitmask takes into account the stretch mode selected 
When the stretch is tile the mask gets applied to each tile.
 2018-01-19 00:01:23 +01:00
Rémi Verschelde 598724c043 Remove obsolete Viewport _update_rect() code 2018-01-18 22:37:45 +01:00
Rémi Verschelde 9f479f096c Fix typos in code and docs with codespell 
Using v1.11.0 from https://github.com/lucasdemarchi/codespell
 2018-01-18 22:01:42 +01:00
Juan Linietsky cc8dfcc9c0 Before I forget, add warnings on areas without children (should not break anything). 
Seen too many users misunderstanding the edit rect is the shape.
 2018-01-18 14:31:07 -03:00
Ian 1b837125ce TextEdit fix get_mouse after many folds 2018-01-18 12:18:06 -05:00
Rémi Verschelde 6c46787749 doc: Replace some more "val" with "value" + sync 2018-01-17 10:43:23 +01:00
Saracen e3fdacdf90 Expose 'lightmap_unwrap' method to the scripting engine. 2018-01-17 03:39:06 +00:00
Juan Linietsky 4de84f4c0a BMFont loading direct support from .fnt files. 2018-01-16 17:58:04 -03:00
volzhs c5e3acc29c Support colored font 2018-01-16 22:56:54 +09:00
Gilles Roudiere b06c6602c8 Changes the keep_margin parameter to true by default, so that people are not suprised that set_anchor changes the margins values 2018-01-15 10:37:13 +01:00
Rémi Verschelde 05b1843818
Merge pull request #15696 from bojidar-bg/15646-assigned-animation 
Fix an issue with the animation editor not seeking to the target time
 2018-01-15 08:54:07 +01:00
Fabio Alessandrelli 765051e104 ViewportContainer passes input down to children viewports 2018-01-15 00:36:57 +01:00
Bernhard Liebl 77b1320fb4 Fixes wrong vertical font layout in RichTextLabel 2018-01-14 19:29:04 +01:00
Rémi Verschelde a1a67e6e84
Merge pull request #15708 from Paulb23/current_line_clipping_issue_15427 
Fixed current line highlighting with horizontal clipping, issue 15427
 2018-01-14 17:22:09 +01:00
Paulb23 386c57cfad Fixed current line highligting with horizontal clipping, issue 15427 2018-01-14 16:06:27 +00:00
Bojidar Marinov f2355949c4
Fix an issue with the animation editor not seeking to the target time properly. 
Fixes #15646.
 2018-01-14 12:28:57 +02:00
Rémi Verschelde 892568abee
Merge pull request #15670 from poke1024/fix15588 
Fixes hangs with Tree in multi selection mode (issue 15588)
 2018-01-13 17:45:03 +01:00
Bernhard Liebl 363980519c Fixes hangs with Tree in multi selection mode (issue 15588) 2018-01-13 17:34:12 +01:00
Rémi Verschelde 69452fbc37
Merge pull request #15657 from paulloz/fix-textedit-undo-redo-selection 
TextEdit: Fix selection issue with undo/redo
 2018-01-13 17:05:46 +01:00
Paul Joannon 8ae0624c80 Deselect on undo/redo in TextEdit 2018-01-13 11:46:53 +01:00
Ruslan Mustakov 0b632be4a9 Fix get_parent_range to return 0 when there is no parent 
Fixes #15635
 2018-01-13 16:48:07 +07:00
letheed 524ee14054 Small fix for Control bindings 2018-01-13 09:40:42 +01:00
Rémi Verschelde 1ca4ad2cca
Merge pull request #15623 from kubecz3k/param-name-rename 
modify default param names in couple of signals
 2018-01-12 19:16:52 +01:00
Rémi Verschelde 187e3d1039
Merge pull request #15629 from endragor/fix-shader-property 
Fix Material's shader property binding
 2018-01-12 18:26:28 +01:00
Ruslan Mustakov b517fc11af Fix Material's shader property binding 
ShaderGraph doesn't exist in 3.0.
 2018-01-12 22:37:00 +07:00
Juan Linietsky 471c2d0d38 Make burley default for materials, fixes #15054 2018-01-12 11:50:08 -03:00
Unknown 5876457410 modify default param names in couple of signals 
'name' default param should not be used since there is problem with name shadowing
 2018-01-12 15:45:29 +01:00
Juan Linietsky 419705db6e Add special coloring to members, to make shadowing more obvious. 2018-01-12 11:01:09 -03:00
Rémi Verschelde bab9759645
Merge pull request #15606 from RandomShaper/fix-inherited-coll-shapes 
Update collision shapes data on tree entered
 2018-01-12 13:48:17 +01:00
Rémi Verschelde 2dbd3475a5
Merge pull request #15620 from AndreaCatania/p4 
Reset collider on ray node
 2018-01-12 12:49:16 +01:00
AndreaCatania 207af6c4f9 Reset collider on ray node 2018-01-12 12:31:02 +01:00
Juan Linietsky a26e6c8215 Renamed tree_exited to tree_exiting. tree_exited is now used for actual out of tree notification. 
Updated doc accordingly.
 2018-01-12 08:29:24 -03:00
Ian d327f75392 TextEdit folding over unindented comments 2018-01-12 00:25:04 -05:00
Juan Linietsky c48aab2f05 Restored multiplication by texture 2018-01-11 20:47:04 -03:00
Juan Linietsky eb16f9939a Removed extra multiplication in baker 2018-01-11 20:23:41 -03:00
Bojidar Marinov 9b8e8b2220
Bind many more properties to scripts 
Notable potentially breaking changes:
- PROPERTY_USAGE_NOEDITOR is now PROPERTY_USAGE_STORAGE | PROPERTY_USAGE_NETWORK, without PROPERTY_USAGE_INTERNAL
- Some properties were renamed, and sometimes even shadowed by new ones
- New getter methods (some virtual) were added
 2018-01-12 00:58:14 +02:00
Rémi Verschelde c1c17b04bd
Merge pull request #15610 from groud/fix_node_resize_setting_anchors 
Fixes nodes being resized or moved when changing an anchor
 2018-01-11 23:46:50 +01:00
Gilles Roudiere 00473e0897 Fixes nodes being resized or moved when changing an anchor 2018-01-11 23:39:49 +01:00
Rémi Verschelde e6edbc7699
Merge pull request #15528 from AndreaCatania/p1 
Fixed viewport node error on editor
 2018-01-11 22:19:02 +01:00
Pedro J. Estébanez aefedb73fc Update collision shapes data on tree entered 
This is needed because the final startup values for shapes may change between parenting and entering the scene tree. For instance, if the collision shape belongs to a inherited scene.

Fixes #13835.
 2018-01-11 21:08:58 +01:00
Juan Linietsky 9a62829759
Merge pull request #15531 from AndreaCatania/p2 
Fixed crash on duplicate GIProbe baking
 2018-01-11 16:44:18 -03:00
Juan Linietsky 5398363572 solved particle memory leak, fixes #15591 2018-01-11 16:04:12 -03:00
AndreaCatania 09a6a74074 Forced no duplication of animation data 2018-01-11 19:52:46 +01:00
AndreaCatania 5ac441131e Fixed crash on duplicate GIProbe baking 2018-01-11 19:50:33 +01:00
AndreaCatania b77968dea3 Fixed resource setup handling 2018-01-11 19:26:28 +01:00
Rémi Verschelde c5b66daec8
Merge pull request #15595 from endragor/fix-light-data-type 
Fix registered light_data property type name
 2018-01-11 15:27:27 +01:00
Ruslan Mustakov 0d83e20236 Fix registered light_data property type name 2018-01-11 19:53:54 +07:00
Paul Joannon 842cb1ad8c set a better initial size to TextEdit nodes 
Address #15163
 2018-01-11 12:11:44 +01:00
Rémi Verschelde 2c17af0509
Merge pull request #15579 from damarindra/add-receptor-tileset 
fix updating tileset list when assign texture and set autotile true
 2018-01-11 11:15:42 +01:00
poke1024 c1db81b9ed Fixes empty line selection when scrolling 2018-01-11 06:51:20 +01:00
damarindra bea40343ab fix updating tileset list when assign texture and set autotile true 2018-01-11 05:50:36 +07:00
Rémi Verschelde 415d128249
Merge pull request #15530 from akien-mga/signal-args 
Fix signal arguments shadowing member variables
 2018-01-10 10:38:28 +01:00
Konrad Nowakowski c73589305e Fix bitwise NOT operator on BitMap's set_bit 2018-01-09 21:11:16 +00:00
Rémi Verschelde 4b6bef6524 Fix signal arguments shadowing member variables 
Fixes #10212.
 2018-01-09 16:51:19 +01:00
Rémi Verschelde e1c799f1b4
Merge pull request #15495 from poke1024/font-oversampling 
Two potential glitches in font oversampling
 2018-01-09 16:03:13 +01:00
Jerome67000 b72c9b85d0 Change primitive meshes acccuracy value 2018-01-09 13:41:59 +01:00
Rémi Verschelde 4b414f45c4
Merge pull request #15507 from poke1024/fix15106 
Fix whole word search missing occurences
 2018-01-08 22:59:16 +01:00
Bernhard Liebl 3af5dfbbf3 Fix whole word search missing occurences 2018-01-08 22:50:33 +01:00
Rémi Verschelde 05297d8b39
Merge pull request #15060 from poke1024/camera2d-update 
Update Camera2D scroll using NOTIFICATION_INTERNAL_PROCESS
 2018-01-08 19:31:50 +01:00
Bernhard Liebl d4adcf3fa2 Update Camera2D scroll using NOTIFICATION_INTERNAL_PROCESS 2018-01-08 18:29:22 +01:00
Bernhard Liebl a64dc5af74 Two potential glitches in font oversampling 2018-01-08 18:09:41 +01:00
Juan Linietsky c791c1d48e
Merge pull request #14907 from scayze/rigid_vehicle 
Added RigidBody functionality to VehicleBody
 2018-01-08 11:50:49 -03:00
Rémi Verschelde 380169e3ef
Merge pull request #15446 from marcelofg55/video_mix_rate 
Fix Video Player issue with audio mix_rate when different than 44100
 2018-01-07 17:06:22 +01:00
Rémi Verschelde 1b098e6466
Merge pull request #15445 from poke1024/fix15392 
Fix stale dynamic font reference fetch from cache
 2018-01-07 17:05:16 +01:00
Marcelo Fernandez 6fc1801b6a Fix Video Player issue with audio mix_rate when different than 44100 2018-01-07 12:57:48 -03:00
Bernhard Liebl 526e637a97 Fix stale dynamic font reference fetch from cache 
Seems to fix issue 15392
 2018-01-07 16:57:23 +01:00
Bernhard Liebl 249521670d Corrects wrong scrolling for short popups broken in 15405 2018-01-07 02:19:11 +01:00
Scayze 4a201ade76 Added RigidBody functionality to VehicleBody 2018-01-07 00:18:42 +01:00
Ian b3ad2538d0 fix center viewport out of size error, #15411 2018-01-06 18:06:09 -05:00
Juan Linietsky 9cf19f8dee Ensure depth reads go via alpha render list, fixes #14759 2018-01-06 17:38:39 -03:00
Juan Linietsky 50b975548d Removed PBM bitmap loader, added abiliy to importi mages as bitmap. Fixes #14828 2018-01-06 16:38:36 -03:00
Rémi Verschelde b6989d0b51
Merge pull request #15412 from poke1024/fix-tree-get-rect-crash 
Fix crash when calling tree API before NOTIFICATION_ENTER_TREE
 2018-01-06 19:56:29 +01:00
Rémi Verschelde b77c6d43a8
Merge pull request #15405 from poke1024/fix-popup-scroll 
Allow popup menu scrolling without mouse wheel
 2018-01-06 19:55:36 +01:00
Bernhard Liebl 4cbe726cf5 Fix crash when calling tree API before NOTIFICATION_ENTER_TREE 2018-01-06 19:48:54 +01:00
Bernhard Liebl 3f9a7da857 Allow popup menu scrolling without mouse wheel 2018-01-06 16:21:27 +01:00
Poommetee Ketson 768fd83e61 Fix typo in new strings 2018-01-06 21:33:11 +07:00
volzhs 13af5e8878 Remove button from button_group when free 2018-01-06 06:06:22 +09:00
Juan Linietsky 90d47ae23d Force button release when window focuses out, fixes #15318 and likely many other issues. 2018-01-05 15:40:08 -03:00
Fabio Alessandrelli a63a82d5e5 Fix theme inheritance 2018-01-05 18:30:40 +01:00
Bernhard Liebl 85ecd79012 Boost drawing speed of ItemLists with many items 2018-01-05 17:40:53 +01:00
Rémi Verschelde e4213e66b2 Add missing copyright headers and fix formatting 
Using `misc/scripts/fix_headers.py` on all Godot files.
Some missing header guards were added, and the header inclusion order
was fixed in the Bullet module.
 2018-01-05 01:22:23 +01:00
Rémi Verschelde 92e114edfd
Merge pull request #15335 from volzhs/popup-menu 
Fix PopupMenu to show & detect properly hover area
 2018-01-04 19:54:19 +01:00
Rémi Verschelde 32bb236f24
Merge pull request #15334 from poke1024/textedit-mousepos 
Fix TextEdit::_get_mouse_pos rounding errors
 2018-01-04 19:53:43 +01:00
volzhs f2d531bd43 Fix PopupMenu to show & detect properly hover area 
Fix #15275
 2018-01-05 02:37:46 +09:00
Bernhard Liebl cc64679a20 Fix TextEdit::_get_mouse_pos rounding errors 2018-01-04 18:30:15 +01:00
Rémi Verschelde dc2cc6bc2b
Merge pull request #15186 from GodotExplorer/default-theme 
Fix errors with custom theme and custom font in project settings.
 2018-01-04 14:50:15 +01:00
Rémi Verschelde 94bda27659
Merge pull request #15317 from poke1024/fix-rtl-underline 
RichTextLabel: don't draw underline character-wise
 2018-01-04 13:30:00 +01:00
Bernhard Liebl e74e2763bd RichTextLabel: don't draw underline on single characters 2018-01-04 12:10:29 +01:00
Rémi Verschelde 465d66be67
Merge pull request #15314 from poke1024/tree-rlines 
Tree: only draw visible relationship lines
 2018-01-04 10:33:55 +01:00
Bernhard Liebl e9aa6f2943 Tree: only draw visible relationship lines 2018-01-04 10:03:46 +01:00
Rémi Verschelde 59ce175767
Merge pull request #15312 from poke1024/fix-rtl-table-wrap 
Fixes word wrapping in tables in RichTextLabel
 2018-01-04 09:07:31 +01:00
Bernhard Liebl c6c016e95a Fix word wrapping in tables in RichTextLabel 2018-01-04 08:22:41 +01:00
firefly2442 f066991aa7 found via cppcheck: 
remove code that will never run
make definition and declaration names for parameters match
change floats that were being set to bool values
remove pointer that is never used
 2018-01-03 21:23:48 -07:00
Rémi Verschelde 023c04689e
Merge pull request #15308 from ianb96/horizontal_scrolling 
TextEdit horizontal scrolling with shift
 2018-01-04 01:35:38 +01:00
Rémi Verschelde d65ac7378c Fix crash in OS::execute on FreeBSD 
As spotted by @robfram, closes #15288.
Also reviewed other uses of `if (String.find(.*))` for potential similar mistakes, found a wrong (and useless) one in ScriptEditorDialog.
 2018-01-04 01:20:20 +01:00
Rémi Verschelde f9f6f250e6
Merge pull request #15191 from Jerome67000/z_renaming 
renames "z" Node2D property to "z_index"
 2018-01-04 00:41:45 +01:00
Ian ae6b7c0b41 TextEdit horizontal scrolling with shift 2018-01-03 17:21:54 -05:00
Juan Linietsky cd63407aa4 Avoid crashes in skeleton 2018-01-03 17:27:31 -03:00
Jerome67000 42ae3525a3 #15078 renamed "z" -> "z_index" property in Node2D 2018-01-03 13:02:26 +01:00
Rémi Verschelde ffd6838704
Merge pull request #15192 from volzhs/expose-quit-on-go-back 
Bind SceneTree::set_quit_on_go_back() to gdscript
 2018-01-03 12:14:16 +01:00
Rémi Verschelde b23f7bc923
Merge pull request #15161 from volzhs/tween-follow 
Fix Tween follow not working
 2018-01-03 11:45:19 +01:00
Rémi Verschelde e3c744f9f1
Merge pull request #15127 from poke1024/smooth-scroll-play 
Remove some lagginess from TextEdit's smooth scrolling
 2018-01-03 11:34:42 +01:00
Rémi Verschelde fd5f193da5
Merge pull request #15103 from poke1024/lineedit-key-up-down 
Support KEY_UP and KEY_DOWN in LineEdit
 2018-01-03 11:32:31 +01:00
Rémi Verschelde 48962db5b4
Merge pull request #15132 from RandomShaper/fix-multiple-finish 
Fix AnimationPlayer redundantly signaling finish
 2018-01-03 11:24:48 +01:00
Rémi Verschelde 459ee51338
Merge pull request #15093 from poke1024/canvas-editor-select 
More exact picking for canvas editor
 2018-01-03 11:15:28 +01:00
Rémi Verschelde 592b0fc068
Merge pull request #15063 from poke1024/textedit-select-last-line 
Fix key down on last line in TextEdit
 2018-01-03 10:30:51 +01:00
Rémi Verschelde 6cd33f17f7
Merge pull request #14792 from Krakean/enh-1 
A few small Debugger->Errors tab enhancements:
 2018-01-03 10:26:55 +01:00
Juan Linietsky 14772d2213
Merge pull request #15083 from tagcup/spatial_rot_fix 
Restore the behavior of Spatial rotations recently changed in c1153f5.
 2018-01-02 15:02:19 -03:00
Rémi Verschelde d7d8fc6c20
Merge pull request #14983 from Paulb23/keyboard_selection_issue_14675 
Fixed keyboard word selection when at the start/end of line, issue 14675
 2018-01-02 11:19:34 +01:00
MrCdK 5bc010e8ee Added pitch scale property to AudioStreamPlayer, AudioStreamPlayer2D and AudioStreamPlayer3D 2018-01-01 22:23:16 +01:00
Rémi Verschelde b50a9114b1 Update copyright statements to 2018 
Happy new year to the wonderful Godot community!
 2018-01-01 14:40:47 +01:00
Noshyaar 7d0212f4eb
Merge pull request #14953 from poke1024/fix-toolbar-gesture 
Hide tooltip on gesture input
 2018-01-01 18:53:11 +07:00
Noshyaar 97d7f689e1
Merge pull request #14972 from poke1024/fix-unindent-col-0 
Fix unindent (shift-tab) on column 0
 2018-01-01 18:52:06 +07:00
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 45612f1657
Merge pull request #15121 from yanorax/treeitem_set_text_align_fix 
Fix TreeItem cell text alignment
 2018-01-01 18:47:35 +07:00
firefly2442 6af109cd99 change float to bool as correct type 2017-12-30 22:14:27 -07:00
volzhs c132d873b1 Bind SceneTree::set_quit_on_go_back() to gdscript 
Fix #15189
 2017-12-30 21:15:17 +09:00
geequlim bd0a9f4bd6 Fix errors with custom default theme and custom fonts. 2017-12-30 17:30:37 +08:00
Juan Linietsky c595aff4a3 avoid error on setting skeleton from transform changed 2017-12-29 12:36:44 -03:00
Juan Linietsky 2de70698ae Missing transform notification for Skeleton. 2017-12-29 11:55:34 -03:00
Juan Linietsky 448b58ba4c Use a different approach to update skeletons when transform changes 2017-12-29 11:34:36 -03:00
Juan Linietsky a54e3f72ce Update the skeleton on transform 2017-12-29 10:54:24 -03:00
volzhs c3f59f290c Fix Tween follow not working 
Fix regression from 7609efe757
 2017-12-29 21:59:45 +09:00
Pedro J. Estébanez 9c3fbfc9db Fix AnimationPlayer redundantly signaling finish 
Now it will emit only when actually going from not-finished-yet to finished, as has always been the case.

The bug was a side effect of 2d2467c0ff.
 2017-12-28 21:48:09 +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
Bernhard Liebl 2897523d12 Fix unindent (shift-tab) on column 0 and more 2017-12-28 17:48:40 +01:00
Bernhard Liebl b80bc553dd Double-click word selection for RichTextLabel (i.e. docs) 2017-12-28 17:44:22 +01:00
Bernhard Liebl d640542f6d Remove some lagginess from TextEdit's smooth scrolling 2017-12-28 15:49:37 +01:00