Commit graph

1132 commits

Author SHA1 Message Date
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
Rémi Verschelde
ba0ec2ffd2
Merge pull request #16792 from Yanpas/md_maker
fixed md script
2018-02-18 17:46:34 +01:00
Yan Pas
059221f123 fixed md script 2018-02-18 17:13:47 +03:00
Benjamin Stammen
6af7dafd6c
Direct to InputEventJoypadButton for using buttons 2018-02-16 17:59:44 -08:00
Anish
84e8c49f5d Documentation tool does not add escapes to code and codeblocks
Instead of adding the escapes to all * and _ the tool now excludes
the characters inside [code] and [codeblock].

Resolves: #15156
2018-02-16 02:24:05 +05:30
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
Rémi Verschelde
f2a26fba96
Merge pull request #15845 from Anutrix/master
Added description to get_collision_mask_bit and set_collision_mask_bit in RayCast2D.xml
2018-01-18 19:13:23 +01:00
Abhas Kumar Sinha
1a1303a948 Update MultiMeshInstance and WorldEnvironment documentation
With some edits by @akien-mga.
2018-01-18 19:11:33 +01:00
Anutrix
0ec8f4c06b Added description to get_collision_mask_bit and set_collision_mask_bit in RayCast2D.xml 2018-01-18 23:14:31 +05:30
Chaosus
fc5cc57d82 few doc fixes 2018-01-17 13:28:59 +03:00
Rémi Verschelde
6c46787749 doc: Replace some more "val" with "value" + sync 2018-01-17 10:43:23 +01:00
Chaosus
0c9312c6b8 Fixes for parameter names of builtin functions in visual scripts/core 2018-01-16 19:49:45 +03:00
Michael Alexsander Silva Dias
0dce89c862 [DOCS] Description for the JavaScript singleton in @GlobalScope. 2018-01-15 21:15:04 -02:00
Juan Linietsky
03475ba197 Filled tutorial field in most relevent classes.
Added tutorial display in doc.
2018-01-15 18:41:13 -03: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
c01575b312 doc: Sync with current source 2018-01-13 11:43:49 +01:00
Rémi Verschelde
e28cdc4654 doc: Update version string in XML 2018-01-13 11:43:42 +01:00
letheed
524ee14054 Small fix for Control bindings 2018-01-13 09:40:42 +01:00
Grosskopf
a9b18041fc Added some explanations that should make it easier to use the AnimationTreePlayer 2018-01-12 19:26:03 +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
Rémi Verschelde
baef1e71c7 Fix malformed doc after #15611 2018-01-12 09:03:11 +01:00
Bojidar Marinov
ad79c70300
Update docs
[ci skip]
2018-01-12 00:58:22 +02:00
Juan Linietsky
e633a04c42 Update documentation to clarify that list of overlaps is not updated immediately. 2018-01-11 11:19:12 -03:00
poke1024
75d69fb4ec Add shuffle() method to Array 2018-01-10 19:36:53 +01: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
Rémi Verschelde
7251c5b582 Improve Control and Label documentation about mouse filtering
Fixes #9657.
2018-01-09 17:40:19 +01:00
Rémi Verschelde
52165fa12d Fix bindings of EditorSettings.set_initial_value
Also ran doctool.
2018-01-09 16:52:46 +01:00
Rémi Verschelde
4b6bef6524 Fix signal arguments shadowing member variables
Fixes #10212.
2018-01-09 16:51:19 +01:00
Todd Ross
6e932c3108 obsolete UndoRedo max_steps; no users identified 2018-01-08 10:57:07 -06:00
Rémi Verschelde
efe27c6ed2
Merge pull request #15491 from volzhs/doc-kinematicbody
Fix KinematicBody documentation about move_and_slide
2018-01-08 17:09:06 +01:00
volzhs
e04a9cdf6e Fix KinematicBody documentation about move_and_slide 2018-01-09 01:05:28 +09:00
Jerome67000
feef8615d2 Add standardised color names to doc 2018-01-08 11:55:49 +01:00
Rémi Verschelde
b5b2ca8143
Merge pull request #15423 from agmcleod/master
Documentation interpolation functions - Indicate what "t" means in interpolation docs
2018-01-07 14:27:28 +01:00
Rémi Verschelde
29e68aa40e doc: Sync classref with current source 2018-01-07 01:37:45 +01:00
Aaron McLeod
b04610b5e7 Indicate what "t" means in interpolation docs 2018-01-06 18:28:21 -05:00
Jerome67000
b5885c43eb Fix crash when using Image.resize() without calling Image.create() first 2018-01-06 13:20:45 +01:00
Rémi Verschelde
1f382ba434
Merge pull request #15333 from PJB3005/18-01-04-control-mouse-filter-docs
Document Control.mouse_filter and its constants.
2018-01-04 19:51:41 +01:00
PJB3005
305ab94431 Document Control.mouse_filter and its constants. 2018-01-04 18:20:19 +01:00
Rémi Verschelde
913777b773
Merge pull request #14914 from fodinabor/fix13254
Enum members now also link to the corresponding class in the webdocs
2018-01-04 15:00:06 +01:00
Rémi Verschelde
914f51031c doc: Sync classref with current source 2018-01-04 01:48:24 +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
Rémi Verschelde
8d03cafd7c doc: Sync classref with current source 2018-01-03 13:45:03 +01:00
Jerome67000
42ae3525a3 #15078 renamed "z" -> "z_index" property in Node2D 2018-01-03 13:02:26 +01:00
Rémi Verschelde
4be31e37b0
Merge pull request #15157 from Noshyaar/prdocs
[DOCS] Minor docs fix
2018-01-03 12:17:06 +01:00
Rémi Verschelde
6322b0bbb7
Merge pull request #12814 from guilhermefelipecgs/add_hardware_custom_cursor
Custom hardware-accelerated mouse cursor
2018-01-03 08:35:59 +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
Andrew Silver
0c57394d6e Updated timer docs 2017-12-31 20:13:25 +01:00
Poommetee Ketson
7753b8ba0f
Minor docs fix 2017-12-31 03:19:52 +07:00
Noshyaar
ef2ab0de82
Merge pull request #15006 from CyanBlob/master
Update TileMap doc descriptions for update_bitmask_area/region

[ci skip]
2017-12-28 06:52:37 +07:00
tagcup
e9896b17a9 Restore the behavior of Spatial rotations recently changed in c1153f5.
That change was borne out of a confusion regarding the meaning of "local" in #14569.

Affine transformations in Spatial simply correspond to affine operations of its Transform. Such operations take place in a coordinate system that is defined by the parent Spatial. When there is no parent, they correspond to operations in the global coordinate system.
This coordinate system, which is relative to the parent, has been referred to as the local coordinate system in the docs so far, but this sloppy language has apparently confused some users, making them think that the local coordinate system refers to the one whose axes are "painted" on the Spatial node itself.

To avoid such conceptual conflations and misunderstandings in the future, the parent-relative local system is now referred to as "parent-local", and the object-relative local system is called "object-local" in the docs.

This commit adds the functionality "requested" in #14569, not by changing how rotate/scale/translate works, but by adding new rotate_object_local, scale_object_local and translate_object_local functions. Also, for completeness, there is now global_scale.

This commit also updates another part of the docs regarding the rotation property of Spatial, which also leads to confusion among some users.
2017-12-27 16:40:49 -05:00
Andrew Thomas
9ac312f17a Update TileMap doc descriptions for update_bitmask_area/region 2017-12-27 14:16:05 -06:00
Noshyaar
07d0f2e72b
Merge pull request #15046 from YeldhamDev/optionbutton_changes
Added "get_popup" method for OptionButton
2017-12-27 10:22:22 +07:00
Noshyaar
198bb5309d
Merge pull request #15049 from YeldhamDev/get_popup_const
Made MenuButton and ColorPickerButton's "get_popup" methods return constant
2017-12-27 10:20:56 +07:00
homer666
cef20a134e [DOCS] PhysicsDirectSpaceState enhancements 2017-12-27 07:41:50 +11:00
homer666
8fb4c9952a [DOCS] Physics2DDirectSpaceState 2017-12-27 06:59:43 +11:00
Michael Alexsander Silva Dias
23080c7ed7 Made MenuButton and ColorPickerButton's "get_popup" methods return constant. 2017-12-25 14:03:53 -02:00
Michael Alexsander Silva Dias
096b5a65c6 Added "get_popup" method for OptionButton and minor changes. 2017-12-25 13:49:27 -02: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
d141cfb740
Merge pull request #14819 from homer666/master
[DOCS] PhysicsDirectSpaceState

[ci skip]
2017-12-25 08:25:28 +07:00
Chris Bradfield
00c2005307 [DOCS] minor corrections to Transform2D 2017-12-24 13:12:07 -08:00
Rémi Verschelde
7d9b7f9c47
Merge pull request #14897 from BastiaanOlij/arvr_tweaks
Few small tweaks for ARVR
2017-12-23 00:59:09 +01:00
Max Hilbrunner
1cae77cc66
[DOCS] Small fixes for Semaphore 2017-12-22 16:55:18 +01:00
Max Hilbrunner
b7d945124e
[DOCS] Small fixes for Mutex 2017-12-22 16:46:09 +01:00
Nathan Warden
4db01d18e5 Finished the documentation for AnimationPlayer 2017-12-22 08:49:20 -05:00
Joachim Meyer
3ca84df551 Enums get listed in the docs and enum members now also link to the
corresponding enum in the webdocs
Fixes #13254
2017-12-22 00:38:03 +01:00
Bastiaan Olij
6fd51b6a1b Reserved controller ids 1 and 2 for left and right hand controllers and added new center on hmd option 2017-12-22 01:21:23 +11:00
homer666
75c3812ab5 [DOCS] PhysicsDirectSpaceState 2017-12-21 14:24:48 +11:00
Rémi Verschelde
3c7f06a0e6 doc: Sync classref with current source 2017-12-20 17:16:02 +01: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
Rémi Verschelde
abf20709af doc: Sync classref with current source 2017-12-18 08:13:58 +01:00
Michael Alexsander Silva Dias
95f93e038a Exposed LineEdit's "selection_clear" and renamed it to "deselect". 2017-12-17 15:40:44 -02:00
Guilherme Silva
a392dbdbe3 Add implementation for custom hardware cursor 2017-12-17 13:40:29 -02:00
Rémi Verschelde
d03f35f1bc Bind TextEdit.deselect and update documentation 2017-12-16 21:08:31 +01:00
Rémi Verschelde
0f188461c5
Merge pull request #14365 from willnationsdev/camera-docs
[DOCS] Camera property changes
2017-12-16 14:23:44 +01:00
Rémi Verschelde
dcdf9008ae
Merge pull request #14676 from NathanWarden/nav_create_to_add
Renamed navmesh_create to navmesh_add since no navmesh is created.
2017-12-16 00:36:47 +01:00
Nathan Warden
38caa4126f Renamed navmesh/poly_create to navmesh/poly_add since no navmesh is created. 2017-12-15 15:09:06 -05:00
Rémi Verschelde
7767d89c45
Merge pull request #14580 from Krakean/string_split_new_arg
Added third argument for String.split() function
2017-12-15 19:56:39 +01:00
Dmitry Koteroff
5302fd125b Added third argument for String.split() function (see issue #14349)
Remove negative limit, leave only positive and make it reflect behaviour like in Python
Also limit renamed to maxsplit to match Python one.
Also docs updated.

Fix indent
2017-12-15 21:51:13 +03:00
Noshyaar
01c04d611f
Merge pull request #14646 from willnationsdev/docs4
[DOCS] Animation, CanvasItem, Curve3D, Curve
2017-12-15 17:44:13 +07:00
Nathan Warden
17ed071e16 [DOCS] Completed the docs for the Navigation node. 2017-12-15 00:12:24 -05:00
Will Nations
3533e01eab [DOCS] Animation, CanvasItem, Curve3D, Curve 2017-12-13 23:05:56 -06:00
Rémi Verschelde
aa6772d7ab Revert property changes in "[DOCS] AnimationPlayer new props, members/methods"
This partially reverts commits e79456519d
and 2d07fe2920, which introduced API changes
needing more in-depth review at this stage.

Kept the removal of "get_position" binding, redundant with
"get_current_animation_position". Kept docs changes where applicable.
Also removed the obsolete "stop_all" method which does the same as "stop".

Fixes #14602.
2017-12-14 00:36:41 +01:00
Max Hilbrunner
a187345603 [DOCS] JSON: Small fixes 2017-12-13 21:54:32 +01:00
Noshyaar
55962ce28f
Merge pull request #14530 from mhilbrunner/add-http
HTTPClient: Add PATCH method and missing HTTP status codes
2017-12-12 19:06:25 +07:00
mhilbrunner
a7abb459c9 HTTPClient: Add PATCH method and missing HTTP status codes 2017-12-12 10:56:18 +01:00
Poommetee Ketson
9888a56639 Change statable to multistate, remove extra separator 2017-12-12 09:41:17 +07:00
Rémi Verschelde
33db6a14df
Merge pull request #14566 from cbscribe/kcc_node_docs
[DOC] Update Node class ref
2017-12-12 00:14:07 +01:00
Will Nations
d9cb00151b [DOCS] Camera property changes 2017-12-11 12:48:41 -06:00
Chris Bradfield
6264a52999 [DOC] Update Node class ref 2017-12-11 10:17:09 -08:00
Rémi Verschelde
237be766d4 doc: Sync classref with current source 2017-12-11 09:32:25 +01:00
Rémi Verschelde
c05c66ee01
Merge pull request #14511 from akien-mga/drop_tilemap_center_xy
TileMap: Drop unused center_x/center_y booleans
2017-12-11 00:13:26 +01:00
Rémi Verschelde
aa5f5191f0
Merge pull request #14521 from mhilbrunner/docs-http
[DOCS] HTTPClient & HTTPRequest
2017-12-10 22:13:22 +01:00
Max Hilbrunner
a2385cb992
[DOCS] IP.xml typo fix 2017-12-10 22:06:56 +01:00
mhilbrunner
d2ee1b872f [DOCS] HTTPClient & HTTPRequest 2017-12-10 22:00:05 +01:00
Chris Bradfield
ac23cd8763
Merge pull request #14524 from mhilbrunner/patch-3
[DOCS] IP
2017-12-10 12:46:26 -08:00
Max Hilbrunner
0fb7761f07 [DOCS] IP 2017-12-10 21:24:17 +01:00