Commit Graph

656 Commits

Author SHA1 Message Date
Rémi Verschelde de9683b605
Merge pull request #17559 from simedis/joint_motors
Implemented interface for bullet linear motors
2018-05-08 10:23:41 +02:00
Juan Linietsky 7811156c4f
Merge pull request #17451 from Goutte/feat-base-button-mask
Allow configuration of which mouse buttons the BaseButton responds to
2018-05-07 18:24:17 -03:00
Juan Linietsky 7b065a59fa
Merge pull request #15911 from Zephilinox/ready_signal
Add ready signal to Node
2018-05-07 17:56:10 -03:00
Juan Linietsky 69a96ff4a6
Merge pull request #15943 from poke1024/geometry-line-line
Add Geometry::line_intersects_line_2d()
2018-05-07 17:54:33 -03:00
Max Hilbrunner fb4e9526e8
Merge pull request #18122 from olivergs/wip/rtl-content-height
RichTextLabel, doc: Added new method to get total content height
2018-05-07 14:53:43 +02:00
Juan Linietsky 35322c0678
Merge pull request #18677 from BastiaanOlij/add_no_blend
Add no-blend canvas item render_mode
2018-05-07 09:44:17 -03:00
Bastiaan Olij 6103c8d7a3 Add no-blend canvas item render_mode 2018-05-07 22:41:12 +10:00
Juan Linietsky 38aaf78325
Merge pull request #18524 from BastiaanOlij/keep_3d_linear
Added option to viewport to keep linear color
2018-05-07 09:24:39 -03:00
Max Hilbrunner e15305721d
Merge pull request #18454 from KidRigger/working_timer
Allows setting the Timer wait_time in start method.
2018-05-07 09:37:11 +02:00
Chris Bradfield d7218c742c Rewrite Tween class reference. 2018-05-06 20:12:01 -07:00
Bastiaan Olij 6f7fefa489 Added option to viewport to keep linear color 2018-05-06 19:28:09 +10:00
Max Hilbrunner fc9fad925b
Merge pull request #18146 from mjtorn/gh-mjtorn-rtl-shadow
Implement font shadows for RichTextLabel
2018-05-05 07:01:04 +02:00
Max Hilbrunner 27e349d161
Merge pull request #18612 from Nobelix/pitch-scale-desc
Added a description to the picth_scale property.
2018-05-05 06:34:28 +02:00
Kelly Thomas 28eb97c8ab correct documentation for version number data type 2018-05-04 22:27:58 +08:00
Nobelix 83c4fc2c88 Added a description to the picth_scale property in the AudioStreamPlayer classes. 2018-05-04 13:31:11 +02:00
Zumo ef74954e66 Fully exposes data variable on AudioStreamSample/AudioStreamOGGVorbis...
...and also changes "_set_data" and "_get_data" to "set_data" and "get_data" respectively.
2018-05-01 12:19:15 +02:00
Max Hilbrunner 79f9c3c2ab
Merge pull request #18491 from Calinou/custom-lineedit-secret-character
Make the LineEdit "secret" character customizable
2018-04-30 18:04:22 +02:00
Hugo Locurcio c118a0ee5e
Make the LineEdit "secret" character customizable 2018-04-30 02:25:17 +02:00
Mel Collins b431264f77 [DOCS] Clarify look_at and looking_at 2018-04-29 15:44:07 +02:00
Anish f714637e58 Allows setting the Timer wait_time in start method.
Allows shortening the two line method of Timer.set_wait_time
followed by Timer.start set wait_time as a parameter to
Timer.start. Also modifies the class documentation.

Fixes: #18107
2018-04-27 01:17:20 +05:30
HoratioZEDU 2dcd499707
Fixed (minor) typo in CapsuleShape2D doc page 2018-04-25 11:57:01 +01:00
George Marques ca25f1e6ea
Merge pull request #18176 from nikibobi/string-trim
Add string trim_prefix, trim_suffix, lstrip and rstrip methods
2018-04-22 12:29:44 -03:00
GaryO 06c5a9ed5f Add detail to doc for add_surface_from_arrays (#17911)
Includes review comments from #17911 from @cbscribe and @Noshyaar
2018-04-22 15:23:33 +02:00
Max Hilbrunner d0699b34d7
Merge pull request #18336 from PJB3005/18-04-21-command's
Fixes a typo in the VisualServer.canvas_item_add_set_transform docs.
2018-04-22 15:06:39 +02:00
krogank9 6b797574a2 [DOCS] Add note that Pool*Arrays are passed by value (#18340) 2018-04-22 01:23:50 +02:00
homer666 d4ce53b9b1 [DOCS] Popup.popup_exclusive description 2018-04-22 05:41:15 +10:00
Pieter-Jan Briers 09f79cde69 Fixes a typo in the VisualServer.canvas_item_add_set_transform docs. 2018-04-21 16:10:34 +02:00
Max Hilbrunner 7d6f210ccb
Merge pull request #18316 from Noshyaar/http
[DOCS] add HTTPRequest.request return values
2018-04-20 12:04:44 +02:00
Poommetee Ketson f05e24ed18 [DOCS] add HTTPRequest.request return values 2018-04-20 16:34:30 +07:00
Craigory V Coppola 0dd526e062 Docs update for several classes
Namely: Dictionary, GraphEdit, Object, TileMap, Script, ScollBar,
ScrollContainer and SplitContainer
2018-04-19 21:09:53 +02:00
bosak 79ecdee496
add string trim_prefix trim_suffix lstrip and rstrip methods 2018-04-17 14:15:43 +03:00
bncastle 7eed3cc199 Add descriptions for GroupCall flags
Add descriptions for GroupCall flags
2018-04-16 10:44:46 -04:00
Poommetee Ketson 7b5703bc41
Merge pull request #18210 from willvincent/feature/exp_doc_fix
Fix/Remove potentially confusing references to Euler

[ci skip]
2018-04-16 00:17:37 +07:00
Will Vincent b6b8c7b215 Remove incorrect & potentially confusing references to Euler
e is referred to as Euler’s number, so technically the MATH_EXP description in VisualScript doc was not incorrect, though could potentially lead to confusion.

e is different from Euler’s constant however, making the existing GDScript exp & VisualScriptMathConstant descriptions nvalid.
2018-04-15 11:40:31 -05:00
Michael Alexsander Silva Dias 9c3698dee2 Minor fixes for the AnimationPlayer doc. 2018-04-14 22:48:46 -03:00
Markus Törnqvist 1c6ea572ca Implement font shadows for RichTextLabel 2018-04-12 15:09:48 +03:00
Oliver Gutierrez 63a472aea4 RichTextLabel, doc: Added new method to get total content height 2018-04-11 14:53:13 +01:00
Poommetee Ketson 72aa87758a
Update classref and docs, fix missing parameters' name 2018-04-11 10:20:22 +07:00
Max Hilbrunner 66714a3d29 [DOCS] OS 2018-04-10 17:30:34 +02:00
Rémi Verschelde cb7fe2c793 doc: Sync classref with current source 2018-04-10 10:12:42 +02:00
Rémi Verschelde fd32a98145
Merge pull request #18071 from denisw/navigation2d-docs
[DOCS] Navigation & Navigation2D
2018-04-10 08:14:54 +02:00
Rémi Verschelde a360a9b348
Merge pull request #18091 from RandomShaper/icon-radio-item
Add support for radio-looking items with icon
2018-04-10 08:09:18 +02:00
Rémi Verschelde 866cb2805f
Merge pull request #17080 from simedis/pretty_print_tree
Made Node.print_tree() print prettily
2018-04-10 07:50:10 +02:00
Denis Washington 89b9e8852e Add Navigation docs 2018-04-10 07:22:30 +02:00
Denis Washington a7f3933a51 Add Navigation2D docs 2018-04-10 07:22:30 +02:00
Rémi Verschelde ca1312dbe9
Merge pull request #18083 from Noshyaar/tutorial
Add new transform tutorial to the appropriate classes
2018-04-09 22:15:38 +02:00
Pedro J. Estébanez b964a9e678 Add support for radio-looking items with icon
Letting users of `PopupMenu` use them. `OptionButton` was one of those interested and is updated in this commit.

Fixes #18063.
2018-04-09 19:55:54 +02:00
Rémi Verschelde 93ae37f118
Merge pull request #18069 from mhilbrunner/docs-scenetree
[DOCS] SceneTree
2018-04-09 19:49:44 +02:00
Geoffrey 8362ce4769 Made print_tree_pretty() function which displays scene tree graphically 2018-04-09 15:01:37 +02:00
Poommetee Ketson e83af5dfc6 Add new transform tutorial to appropriate classes 2018-04-09 17:44:13 +07:00
Max Hilbrunner bc66869d4c [DOCS] SceneTree 2018-04-08 23:34:17 +02:00
Juan Linietsky b756172bdb
Merge pull request #16705 from Chaosus/generate_normals_flip
Add flip switch to SurfaceTool.generate_normals
2018-04-08 17:18:03 -03:00
Juan Linietsky a6c9ccf007
Merge pull request #17150 from robfram/check-animation-playing-backwards
Added `get_playing_speed` method to AnimationPlayer, returning the actual playing speed of the animation being played
2018-04-08 11:36:15 -03:00
Juan Linietsky 6eb0c74e9d
Merge pull request #17443 from Noshyaar/tilesetcrash
Fix converting to tileset crashes Godot if existing file is not tileset
2018-04-08 09:31:54 -03:00
Juan Linietsky cd7e9d9642
Merge pull request #17583 from RandomShaper/enhance-uri-utils
Enhance uri utils
2018-04-07 17:07:29 -03:00
Juan Linietsky 187b14ae24
Merge pull request #17730 from RandomShaper/radio-buttons-in-menus
Radio buttons in menus
2018-04-07 16:41:39 -03:00
Mel Collins 99110772c0 [DOCS] Tweaks and fixes for (Interpolated)Camera 2018-04-03 15:58:21 +02:00
Michael Alexsander Silva Dias d912e10c65 Added missing end points for brief descriptions in the docs. 2018-03-30 20:11:14 -03:00
Mel Collins c05d12384a [DOCS] Some content for InterpolatedCamera 2018-03-30 19:15:38 +02:00
mhilbrunner 41da122875 [DOCS] Typo fix for CollisionShape[2D] 2018-03-30 16:42:06 +02:00
Poommetee Ketson 4dbae5a738
Merge pull request #17839 from Noshyaar/1
[Docs] Control, VehicleWheel: fix typos

[ci skip]
2018-03-29 12:55:15 +07:00
Poommetee Ketson a88ee7d920 [Docs] fix typos 2018-03-29 12:46:21 +07:00
Max Hilbrunner 13d5ee01f9
[DOCS] Node & PackedScene (#17833)
* [DOCS] Node: SceneSaver -> PackedScene

* [DOCS] PackedScene: Code example, resolve TODO
2018-03-28 23:07:03 +02:00
Max Hilbrunner b59ae81538
[DOCS] Generic6DOFJoint fixes 2018-03-28 22:44:26 +02:00
Pedro J. Estébanez ab3b1d9f3e Add radio-button-looking entries to PopupMenu
They work exactly the same as current checkbox-decorated items, but in order to preserve compatibility, separate methods are used, like `add_radio_check_item()`. The other option would have been to add a new parameter at the end of `add_check_item()` and the like, but that would have forced callers to provide the defaults manually.

`is_item_checkable()`, `is_item_checked()` and `set_item_checked()` are used regardless the item is set to look as check box or radio button.

Keeping check in the name adds an additional clue about these facts.

Closes #13055.
2018-03-27 19:19:45 +02:00
Pedro J. Estébanez 8d8e9d54c8 Enhance HTTPClient.query_string_from_dict() 2018-03-27 19:18:32 +02:00
Poommetee Ketson ed3b080ca6 Fix converting to tileset crashes Godot if existing file is not tileset
also make TileSetEditorPlgn tile list updates the preview modulate
2018-03-23 21:27:30 +07:00
Poommetee Ketson 7d18334ad2
[DOCS] minor ParticlesMaterial docs fix Linear -> Radial 2018-03-21 23:44:09 +07:00
Pieter-Jan Briers 11aa330a6f Improve Input.is_action_just_* docs.
More clarification.
2018-03-18 13:41:25 +01:00
Michael Alexsander Silva Dias 712d6e724a Fixed small typo in the "InstancePlaceholder" doc. 2018-03-17 16:00:36 -03:00
Geoffrey 09c887f38e Implemented interface for bullet joint motors 2018-03-16 13:37:15 +01:00
Max Hilbrunner 7275fb6170
[DOCS] Node: Remove duplicate information 2018-03-16 11:48:45 +01:00
Hein-Pieter van Braam 9bc0503c91
Merge pull request #17376 from marcelofg55/file_get_path
Added File.get_path and File.get_path_absolute functions
2018-03-15 22:21:21 +01:00
Rémi Verschelde 9bb1b55486
Merge pull request #17514 from brylie/patch-1
Add brief description
2018-03-15 20:45:26 +01:00
mhilbrunner 5a3e841c60 [DOCS] Node: Networking updates, fix outdated and missing docs 2018-03-15 20:00:34 +01:00
Brylie Christopher Oxley 32fc6c9041
Add brief description 2018-03-14 23:23:38 +02:00
Rémi Verschelde a8bbb708a8
Merge pull request #17489 from mhilbrunner/docs-input
[DOCS] Input
2018-03-14 12:29:47 +01:00
Goutte ed69345a19 Add a binary mask to allow configuration of which mouse buttons the BaseButton will respond to. 2018-03-13 23:59:53 +01:00
Max Hilbrunner c90f18e3f5
[DOCS] Environment: Whitespace fixes 2018-03-13 21:24:17 +01:00
Max Hilbrunner 22cb4a1cf9 [DOCS] Input 2018-03-13 20:12:10 +01:00
Marcelo Fernandez a4e64c5454 Added File.get_path and File.get_path_absolute functions 2018-03-13 12:07:37 -03:00
Rémi Verschelde c81356153e
Merge pull request #16971 from Noshyaar/tilemap
TileMap: add fix_invalid_tiles
2018-03-13 13:57:58 +01:00
Rémi Verschelde 96bda9c463
Merge pull request #17094 from Calinou/add-dynamicfont-hinting-options
Add an hinting mode setting to DynamicFonts
2018-03-13 13:38:35 +01:00
Neil Moore 60f1f58158 Update Image format enumeration documentation
Provides more information about each image format.
2018-03-10 01:41:50 -05:00
Bernhard Liebl 9d7856620c Bring back Vector2.cross() 2018-03-07 21:10:31 +01:00
Max Hilbrunner fdd0f18959
[DOCS] Small fix to Area: Fix copy/paste errors 2018-03-03 10:52:14 +01:00
robfram 5ef88cf577 Added `get_playing_speed` method to AnimationPlayer, returning the actual
playing speed of the animation being played.

As stated in #16550, there is no way to get the playing speed of an
animation. The `playback_speed` property is for the whole AnimationPlayer
node, and the argument passed to `play` method is another scale applied
in top of the AnimationPlayer properties.

Thus, the actual playing speed is AnimationPlayer.speed_scale *
AnimationPlayer.playback.current.speed_scale. If it is not playing, the
method returns 0.
2018-03-03 09:29:22 +01:00
Poommetee Ketson b099a500eb
s/Camear/Camera in docs 2018-03-02 23:20:14 +07:00
Max Hilbrunner 0b65bac1a1
[DOCS] Small fix to PinJoint2D 2018-03-02 04:59:17 +01:00
Hugo Locurcio a0ddd6122c
Add documentation for the DynamicFont hinting property 2018-03-01 22:23:18 +01:00
Rémi Verschelde 47676cfa98 doc: Sync classref with current source 2018-02-27 13:41:27 +01:00
Rémi Verschelde 3fa77b3172 doc: Remove status from hardcoded version string
It has no practical use case and just generates noise for each alpha, beta, etc.
2018-02-27 13:40:49 +01:00
indicainkwell 7154a96d3f added docs on Control's drag and drop api 2018-02-26 15:54:08 -08:00
Rémi Verschelde 2df206e6a8
Merge pull request #17003 from Noshyaar/docs
[DOCS] Sync classref with current source
2018-02-25 10:06:16 +01:00
Poommetee Ketson eb63f7b071 [DOCS] Sync classref with current source 2018-02-25 15:14:25 +07:00
Rémi Verschelde d356bd605b
Merge pull request #16952 from Noshyaar/datadir
[DOCS] clarify that OS.get_user_data_dir needs project name
2018-02-24 18:33:27 +01:00
Poommetee Ketson 7effe46461 TileMap: add fix_invalid_tiles 2018-02-24 19:34:41 +07:00
Poommetee Ketson 2c22c9dcfb [DOCS] clarify that OS.get_user_data_dir needs project name
[ci skip]
2018-02-24 17:15:06 +07:00
Pieter-Jan Briers b51a86a57a StyleBoxTexture: Texture instead of RES for texture and normal_map. 2018-02-22 19:27:35 +01:00
BastiaanOlij 234b86e6b2 Added documentation for VehicleBody 2018-02-22 17:39:25 +11:00
luz.paz 612ab4bbc6 Fix typos with codespell
Found via `codespell -q 3 --skip="./thirdparty,./editor/translations" -I ../godot-word-whitelist.txt`
Whitelist consists of:
```
ang
doubleclick
lod
nd
que
te
unselect
```
2018-02-21 19:46:06 +01:00
Rémi Verschelde 5109f2ca67
Merge pull request #16874 from volzhs/button-group-desc
Mention about BaseButton.toggle_mode in ButtonGroup description
2018-02-21 08:48:39 +01:00
volzhs 0d0b266143 Mention about BaseButton.toggle_mode in ButtonGroup description 2018-02-21 15:53:30 +09:00
Michael Alexsander Silva Dias 1260ed90bd Clarified what the Tree's signals "item_activated" and "item_double_clicked" do. 2018-02-20 13:11:06 -03:00
Rémi Verschelde 37a6ce5a42
Merge pull request #15563 from poke1024/gdscript-shuffle
Add shuffle() method to Array
2018-02-19 21:53:08 +01:00
Rémi Verschelde a41c45c335
Merge pull request #16060 from sdfgeoff/apply_torque
Exposed apply_torque_impulse to gdscript
2018-02-19 21:38:33 +01:00
Chaosus 399e553829 Added flip switch to generate_normals 2018-02-19 22:40:34 +03:00
Rémi Verschelde 48850d4077
Merge pull request #16738 from YeldhamDev/rigidbodies_descriptions
Made modifications to the RigidBody(2D) descriptions
2018-02-19 20:29:53 +01:00
Michael Alexsander Silva Dias 50e6b3c005 Made modifications to the RigidBody(2D) descriptions. 2018-02-19 14:40:00 -03:00
Rémi Verschelde fee29570d0 doc: Sync classref with current source 2018-02-19 10:47:16 +01:00
Rémi Verschelde 3c7a39b40c doc: Update version string in header 2018-02-19 10:46:33 +01:00
Benjamin Stammen 6af7dafd6c
Direct to InputEventJoypadButton for using buttons 2018-02-16 17:59:44 -08:00
sdfgeoff cdd8334585 Exposed apply_torque_impulse to gdscript and added documentation for added apply_torque_impulse method 2018-02-15 16:42:24 +01:00
Rémi Verschelde 7d7f8d9e54
Merge pull request #15864 from GodotExplorer/pr-get_unique_id-desktop-impl
Implement more methods for OS on Desktop platforms
2018-02-14 16:11:53 +01:00
Rémi Verschelde 8812cb4bfc
Merge pull request #16677 from YeldhamDev/itemlist_reselect
Added "allow_reselect" property to ItemList and enabled it for the method/help lists
2018-02-14 10:45:40 +01:00
Michael Alexsander Silva Dias 4dbf6ac1b8 Added "allow_reselect" property to ItemList and enabled it for the method/help lists. 2018-02-14 03:38:07 -02:00
Fabio Alessandrelli 67b600d957 Add mbedtls module 2018-02-14 01:26:23 +01:00
Rémi Verschelde c2d8960c9c
Merge pull request #16659 from vnen/plugin_order
Expose priority and order for custom import plugins
2018-02-14 00:28:40 +01:00
George Marques da69a06253
Add a function to remove controls from containers
Closes #5968
2018-02-13 19:35:10 -02:00
George Marques c68948fdfa
Expose priority and order for custom import plugins 2018-02-13 11:59:56 -02:00
Rémi Verschelde d0a3bd82c1
Merge pull request #16401 from YeldhamDev/json_example_fix
Fixed wrong example in JSONParseResult
2018-02-13 12:00:09 +01:00
Rémi Verschelde 889b9b6dce
Merge pull request #16306 from mhilbrunner/mhilbrunner-docs-json-keyorder
[DOCS] parse_json: Objects do not keep key order
2018-02-12 08:03:53 +01:00
Andrew Silver da81d9f843 Fixed KinematicBody move_and_slide documentation naming 2018-02-05 21:44:53 +01:00
Michael Alexsander Silva Dias 24e87f97c6 Fixed wrong example in JSONParseResult. 2018-02-04 21:00:16 -02:00
Timur Celik c16f61190c Fix broken variant call of Vector3.snapped 2018-02-03 19:57:12 +01:00
Max Hilbrunner 82b8f1729d [DOCS] parse_json: Objects do not keep key order
Document JSON not guaranteeing key order.
2018-02-02 17:28:36 +01:00
Michael Alexsander Silva Dias 5e0821e867 Small fixes for the Control description in the docs. 2018-02-01 19:43:44 -02:00
geequlim 5980bef672 OSX: implement OS.get_unique_id
Update the documentations for OS.get_unique_id()
2018-02-01 23:29:39 +08:00
Profesor Tartelett 9d735ffacb
Errata fix on Image get_format() description
The description of this function seems to be duplicated from the preceding description.
2018-01-31 19:35:46 +01:00
Rémi Verschelde e7cf2b2e77
Merge pull request #16188 from Schweigert/master
Display set_nodelay to GDScript
2018-01-31 17:26:12 +01:00
Rémi Verschelde 7b69133929
Merge pull request #16197 from Chaosus/viewportdoc
Viewport doc improvements
2018-01-31 17:25:41 +01:00
Rémi Verschelde 8b5be97d1d
Merge pull request #16215 from vnen/graphedit-expose
Expose a few GraphEdit methods to script languages
2018-01-31 17:22:55 +01:00
George Marques b80bc73a17
Expose a few GraphEdit methods to script languages 2018-01-30 22:09:41 -02:00
George Marques 87be0bc110
Add interface for plugins to enable/disable other plugins 2018-01-30 20:25:20 -02:00
Marlon Henry Schweigert 87adf9cfba Display set_nodelay to GDScript
Pass enabled arg

Rename set_nodelay to set_no_delay

Add description to the method

Change description
2018-01-30 13:22:15 -02:00
Chaosus ffcbb0c358 Viewport doc improvements 2018-01-30 17:50:25 +03:00
Poommetee Ketson ebe2337515 Fix wrong return type of xform functions 2018-01-30 18:45:54 +07:00
volzhs a62d8de062 Update ProjectSettings description to correct usage
Fix #16078
2018-01-26 17:17:53 +09:00
Rémi Verschelde f2e3825616 doc: Fix references to online tutorials after godotengine/godot-docs#1015 2018-01-25 09:03:59 +01:00
Rémi Verschelde d516aab8fa doc: Sync with current source
Also enhance RigidBody docs as per https://github.com/godotengine/godot-docs/pull/1018
and fix the version tag in all files (not really stable yet, but it makes no sense
to hardcode rc3 at this stage).
2018-01-25 08:50:56 +01:00
Rémi Verschelde 4808dfb06b doc: Sync with current source 2018-01-24 21:58:39 +01:00
Chaosus 70bba4e62d Fix bug in color doc 2018-01-24 23:39:36 +03:00
PetePete1984 f4d67433e7 More precise description for is_visible_in_tree 2018-01-22 16:22:17 +01:00
Bernhard Liebl c1e099b48f Add Geometry::line_intersects_line_2d() 2018-01-21 15:31:34 +01:00
Todd Ross b57dcf446e clarify OS.execute usage, add examples 2018-01-20 18:36:00 -06:00
Zephilinox a826fb8d8b Add ready signal to Node
Closes #15889
2018-01-20 21:57:59 +00:00
Anutrix 6d4c6449f4 Added description to dedent in String.xml 2018-01-19 15:57:38 +05:30
Poommetee Ketson d7e07fb25a
Merge pull request #15857 from YeldhamDev/find_last_doc
[DOCS] Fixed incorrect information inside String's "find_last" method

[ci skip]
2018-01-19 10:22:21 +07:00
Michael Alexsander Silva Dias d8f6acee4b [DOCS] Fixed incorrect information inside String's "find_last" method. 2018-01-19 00:10:33 -02: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