2472 commits

Author	SHA1	Message	Date
Juan Linietsky	683f50bef4	Merge pull request #9312 from BastiaanOlij/osx_export ... Osx export	2017-06-23 23:22:51 -03:00
Marc Gilleron	659897cfb8	Added Curve resource ... - New resource for curves in y(x) form - CurveTexture now has a Curve - Curve and CurveTexture share the same editor	2017-06-24 01:01:36 +02:00
Thomas Herzog	c5e0c6a336	Merge pull request #9307 from nunodonato/shadererrorline ... highlight the correct error line in shader editor	2017-06-23 02:19:40 +02:00
Juan Linietsky	54815b9dde	project and scene swapped, sorry could never get used to it :( ... Also reorganized menus a bit.	2017-06-22 18:04:03 -03:00
Bojidar Marinov	2edb082c7e	Add normal map to tilemaps and tilesets ... Fixes #9310	2017-06-22 18:15:50 +03:00
BastiaanOlij	5b44f092f9	Reimplement export module for OSX	2017-06-23 00:01:55 +10:00
Mariano Javier Suligoy	320c1af616	Merge pull request #9293 from MarianoGnu/master ... Fix regresion on Texture Region Editor Plugin. Fixes #9282	2017-06-22 07:56:01 -03:00
Nuno Donato	be2f7f4172	highlight the correct error line in shader editor	2017-06-21 21:09:41 +01:00
Juan Linietsky	95560e02c5	2D GPU Particles working..	2017-06-21 16:26:26 -03:00
Andreas Haas	e80d61038b	Fix EditorImportPlugin::get_preset_count ... Was missing a const...	2017-06-20 21:25:12 +02:00
Mariano Suligoy	2b7a826553	Fix regresion on Texture Region Editor Plugin. Fixes#9282	2017-06-20 16:05:36 -03:00
Marc Gilleron	0fd66a4f8f	Fixed freelook conflict with text inputs	2017-06-20 02:50:25 +02:00
Thomas Herzog	86407aebc5	Merge pull request #8407 from Jylhis/popup_item_select_hide ... Update PopupMenu hiding	2017-06-20 00:20:21 +02:00
Poommetee Ketson	443e58e88c	ColorPicker: fix DPI, hue & color update issues	2017-06-20 04:00:05 +07:00
Thomas Herzog	6b93455b6b	Merge pull request #9099 from kubecz3k/plugin-camera-expose ... EditorPlugin can request user inputs from editor 3d view	2017-06-19 22:43:33 +02:00
Juan Linietsky	8928509f09	Merge pull request #9256 from MarianoGnu/master ... Fix ColorPicker's screen pick functionality	2017-06-19 13:32:24 -03:00
Mariano Suligoy	f5185e7ba6	Fix ColorPicker's screen pick functionality	2017-06-19 09:23:57 -03:00
Konrad Nowakowski	6592df74d8	Fix image lock on preview image generating	2017-06-19 12:00:32 +01:00
Kryptocron	4bee1d98fa	Added option to not save a scene when played.	2017-06-17 03:04:50 -07:00
Juan Linietsky	b19225bfce	-Fix freezes caused by etccomp2, closes #9183 ... -Normalmaps are now detected and imported as RGTC, both in S3TC and ETC2, this improves their quality.	2017-06-16 21:49:37 -03:00
Rémi Verschelde	8a03a29233	Merge pull request #9225 from bojidar-bg/attempt-fix-fs-dock ... Fix EditorFileSystem duplicating root folder in new folders	2017-06-16 23:56:07 +02:00
Bojidar Marinov	c89d9720f0	Fix EditorFileSystem duplicating root folder in new folders ... Also, add some uninitialized variables into constructors (I like to applease cppcheck). Also, remove unused md_count. Fixes #3662.	2017-06-16 23:32:46 +03:00
Andreas Haas	16622fccd2	Merge pull request #9221 from volzhs/fix-scene-tab-theme ... Fix scene tab color not updated when theme changed	2017-06-16 19:48:09 +00:00
George Marques	7966ebe6fa	Complete changing of resource extensions ... Some places were missing in e42d59f.	2017-06-16 15:42:18 -03:00
volzhs	d2f72ca923	Fix scene tab color not updated when theme changed	2017-06-17 03:00:57 +09:00
ageazrael	a89658fdb8	Fixed ‘CreateNewAnimation’ window wrong size.	2017-06-16 17:52:49 +02:00
Rémi Verschelde	8b1bc9da88	Merge pull request #9208 from Calinou/tweak-default-fov ... Increase the default perspective camera FOV	2017-06-16 17:51:04 +02:00
BastiaanOlij	9483613138	Godot 3.0 primitives as resources for use with MeshInstance ... Adds the following resources: - CapsuleMesh: a capsule object - CubeMesh: a cube that can be subdivided - CylinderMesh: a cylinder - PlaneMesh: a horizontal plane that can be subdivided - PrismMesh: a prism shape - SphereMesh: a sphere - QuadMesh: reintroduction of the original quadmesh Removes the old Quad and TestCube nodes	2017-06-16 21:40:23 +10:00
Rémi Verschelde	3fadbe2172	Merge pull request #9201 from vnen/rename-extensions ... Rename Godot-specific resource extensions	2017-06-16 13:01:10 +02:00
Hugo Locurcio	cdcc3c919b	Increase the default perspective camera FOV ... This does not affect existing projects, but will affect newly-created editor settings and Camera nodes.	2017-06-16 12:07:07 +02:00
Rémi Verschelde	3e7bbf2ca3	Merge pull request #9196 from volzhs/scene-tab ... Enhance scene tabs	2017-06-16 08:14:45 +02:00
volzhs	fc2fe7ebd1	Enhance scene tabs ... - show scene thumbnail on hover - resize if has many tabs - show full scene file name with current edited scene - can be customized EditorSettings > Interface > Scene Tab - close scene with mouse middle button	2017-06-16 13:21:05 +09:00
George Marques	e42d59f01e	Rename Godot-specific resource extensions	2017-06-15 21:35:20 -03:00
Rémi Verschelde	dc6642bc13	Merge pull request #9102 from Faless/debugger_listen_show_error ... Editor now shows error when debug port is in use	2017-06-15 00:08:44 +02:00
Juan Linietsky	c1df35037f	get rid of button array	2017-06-14 18:27:44 -03:00
Rémi Verschelde	19017a760c	Merge pull request #9158 from Hinsbart/script_templates ... Add ability to use custom script templates.	2017-06-14 23:11:41 +02:00
Rémi Verschelde	80de0c35df	Merge pull request #9160 from karroffel/color-ramp-rename ... renamed occurances of ColorRamp with Gradient	2017-06-14 23:09:30 +02:00
Rémi Verschelde	be31151199	Merge pull request #9174 from volzhs/file-mode-toggle ... Make toggle between thumbnail and list for file dialog on editor	2017-06-14 22:47:50 +02:00
volzhs	7dde056d48	Make toggle between thumbnail and list for file dialog on editor	2017-06-14 23:00:39 +09:00
Karroffel	23c5fa8687	renamed occurances of ColorRamp with Gradient ... ColorRamp got renamed to Gradient recently, reduz missed some occurances though.	2017-06-14 01:24:04 +02:00
Juan Linietsky	a8e845a474	Merge pull request #8548 from tagcup/etc2comp ... Add ETC1/ETC2 compression support though etc2comp.	2017-06-13 19:17:13 -03:00
Andreas Haas	8361b1ce07	Add ability to use custom script templates. ... Templates will be loaded from .godot/script_templates For now they're disabled for GDNative. Ideas for further improvements: - Add a "Save as Template" option to the script editor, as it can normally only save to res:// - Support more placeholders / custom placeholders	2017-06-13 20:03:08 +00:00
Juan Linietsky	831860695c	Fix empty shader related crash, closes #8314	2017-06-12 19:23:37 -03:00
Juan Linietsky	42b2d52c88	Properly adjust the visible editor rect and make limits respected, closes #8328	2017-06-12 16:19:12 -03:00
Andreas Haas	5f1603ca45	EditorSettings: Default game window placement to Centered. ... Fixes #8890	2017-06-12 21:06:37 +02:00
Unknown	d8b65b1657	EditorPlugin can request user inputs from editor 3d view	2017-06-12 17:55:15 +02:00
Juan Linietsky	61c82f4356	Restored everything related to information polling, and added information box for viewport.	2017-06-11 18:13:04 -03:00
Juan Linietsky	4d50c7ad8c	Restored multiple viewport function, as well as view modes.	2017-06-11 15:52:03 -03:00
Juan Linietsky	ec015a32ae	Multiple 3D viewports are not operational.	2017-06-11 11:29:51 -03:00
Zher Huei Lee	9ecdf522bd	Added EditorPlugin.remove_import_plugin() ... Allows addons with import extensions to clean up properly on removal.	2017-06-11 17:18:22 +08:00
Fabio Alessandrelli	b76275ab12	Fix network/debug/remote_port editor setting not working properly	2017-06-10 23:34:35 +02:00
Fabio Alessandrelli	fc1368bee0	Editor now shows error when debug port is in use	2017-06-10 23:34:24 +02:00
alexholly	935f730170	renamed all Rect3.pos to Rect3.position	2017-06-09 15:54:02 +02:00
Rémi Verschelde	63fd693c1e	Merge pull request #9060 from pixelpicosean/scroll-to-pan-canvas-item-editor-3.0 ... Add settings to pan canvas editor with scrolling	2017-06-09 10:48:59 +02:00
Juan Linietsky	612ab8fcdb	-Restored multithread capability to VisualServer ... -Restored resource previews!	2017-06-09 00:24:18 -03:00
Sean Bohan	45b71ac2d0	Add settings to pan canvas editor with scrolling ... This feature is mainly designed for developers who uses touchpad instead of mouse, and want to scroll instead of zoom. Every macOS developers will like it since it feels intuitive. 2 new settings are added to “editors/2d”: scroll_to_pan: turn on to use mouse/touchpad scroll to pan canvas item editor view instead of zoom pan_speed: use this value to change scroll speed	2017-06-08 18:05:41 +08:00
Rémi Verschelde	7a3d557622	Merge pull request #9089 from nunodonato/autoopennew ... Automatically edit new project after creating it in project manager. Fixes #9075	2017-06-08 07:39:09 +02:00
Rémi Verschelde	7570d9589d	Merge pull request #9085 from groud/fix-audio-bus-buttons ... Fix: audio buses buttons hard to see if pressed or not	2017-06-08 07:38:38 +02:00
Rémi Verschelde	932694e759	Merge pull request #9092 from Noshyaar/pr-run ... Fix unsaved scene not running after save	2017-06-08 07:36:24 +02:00
Rémi Verschelde	606b4ee9df	Merge pull request #9051 from toger5/fixedScriptEditorListSeperation ... fixed spacing for script editor script list	2017-06-08 07:34:27 +02:00
Rémi Verschelde	89a7fb3530	Merge pull request #9090 from nunodonato/autorun ... Run project after selecting main scene. Fixes #9077	2017-06-08 07:32:31 +02:00
Poommetee Ketson	6b7021ad90	Fix unsaved scene not running after save	2017-06-08 11:38:31 +07:00
Nuno Donato	1ab0a779d8	Run project after selecting main scene. Fixes #9077	2017-06-07 23:31:53 +01:00
Nuno Donato	9fd41416a9	Automatically open new project after creating it in project manager. ... Fixes #9075	2017-06-07 22:50:24 +01:00
Juan Linietsky	5bf810b5db	-Added proper access to depth texture from shader ... -Split Mesh into Mesh (abstrat class) and ArrayMesh, to allow to proper mesh primitives, as well as streamable meshes in the future.	2017-06-07 18:20:04 -03:00
Gilles Roudiere	0e5daa7436	Fix: audio buses buttons hard to see if pressed or not	2017-06-07 19:38:03 +02:00
Andreas Haas	5f5d629c8a	Merge pull request #9070 from Noshyaar/pr-help2 ... Fix Script Editor stealing focus on class search text changed	2017-06-07 18:59:37 +02:00
toger5	50e5c7f980	fixed overlapping of temp. colors (script editor) ... + added a little bit more spacing to the scripts in the script list. the temp colors now expand to the vseperation, instead of having the same size than the stylebox	2017-06-07 02:41:08 -07:00
toger5	9774c8260f	added style for panel class	2017-06-06 21:11:13 -07:00
Poommetee Ketson	6e1bcb2b44	Fix Script Editor stealing focus on class search text changed	2017-06-07 07:46:26 +07:00
Rémi Verschelde	b21e68c8bc	Merge pull request #9007 from noshyaar/pr-about ... AboutBox: update copyright, add contributors list	2017-06-05 16:49:50 +02:00
Rémi Verschelde	f8d7670e82	Merge pull request #9038 from AlexHolly/rect2-rename-pos ... renamed all Rect2.pos to Rect2.position	2017-06-05 15:52:05 +02:00
Rémi Verschelde	d3afecf681	Merge pull request #8974 from Paulb23/script_overview ... Added script overview	2017-06-05 15:42:12 +02:00
Rémi Verschelde	f09f1456b3	Merge pull request #9050 from vnen/fix-run-window-size ... Update window size property names for editor run	2017-06-05 08:52:58 +02:00
Juan Linietsky	40959acef2	Quick access list to subresources on RMB	2017-06-05 00:12:19 -03:00
Juan Linietsky	01198cb896	Removed stupid right arrow to edit resource. Now simply click it..	2017-06-04 20:35:45 -03:00
George Marques	18d7ab21df	Update window size property names for editor run	2017-06-04 19:55:24 -03:00
toger5	c33eff4bf9	project manager, fixed siing of sort button	2017-06-04 13:54:19 -07:00
alexholly	a3c90b0293	renamed all Rect2.pos to Rect2.position	2017-06-04 02:09:17 +02:00
Andreas Haas	9bc5348961	InputEvent: Renamed "pos" property to "position" ... Make the naming consistent with other classes.	2017-06-03 11:26:39 +02:00
Andreas Haas	d58a58402e	Merge pull request #8971 from noshyaar/pr-help ... EditorHelp: Help>Class now switch to script editor	2017-06-01 21:04:11 +02:00
Poommetee Ketson	db439308e6	About: add contributors list	2017-06-01 18:15:15 +07:00
Ferenc Arn	6a9c990da7	Add ETC1/ETC2 compression support though etc2comp. ... Remove rg-etc1 code. Also updated travis to use ubuntu 14.04. Fixes #8457.	2017-05-31 18:59:00 -05:00
Juan Linietsky	a134f58fb3	rewritten PBR implementation to make it friendlier with Blender	2017-05-31 20:29:56 -03:00
Poommetee Ketson	ef7d1b1571	EditorHelp: Help>Class now switch to script editor	2017-05-31 23:54:54 +07:00
Juan Linietsky	5567e898d1	Several fixes related to PBR and Environment	2017-05-30 08:56:19 -03:00
Paulb23	a4e222ae71	Added members overview	2017-05-29 12:56:33 +01:00
Juan Linietsky	bb20f230ad	-Added .hdr format support ... -Added default environment editor setting -Added environment created by default in new projects -Removed default light and ambient from spatial editor, to make the editor more PBR compliant	2017-05-28 21:48:05 -03:00
Rémi Verschelde	c814d65fae	Merge pull request #8966 from voithos/path2d-bezier-handle-fix ... Fix moving path controls in edit mode.	2017-05-28 10:04:56 +02:00
Rémi Verschelde	8125bbba59	Merge pull request #8968 from noshyaar/pr-bug2 ... CreateDialog: fix activating recent item creates node selected in search result	2017-05-28 09:29:51 +02:00
Poommetee Ketson	db64fcdd5f	CreateDialog: fix activating recent item creates node selected in search result	2017-05-28 13:40:08 +07:00
Poommetee Ketson	9fb90d7aea	CreateDialog: select root if search exactly match	2017-05-28 12:53:11 +07:00
Zaven Muradyan	f460f82ec1	Fix moving path controls in edit mode. ... The previous code would never trigger the subsequent conditionals (for moving the control points) when in EDIT_MODE because the point conditionals were nested instead of being a conjunction.	2017-05-27 18:47:45 -07:00
Rémi Verschelde	d8381ef28f	Merge pull request #8956 from mcanders/mcanders/ProfilerInputFix ... Fix incorrect input event reference in editor_profiler.cpp	2017-05-27 11:36:54 +02:00
Rémi Verschelde	9130f0a89f	Merge pull request #8955 from mcanders/mcanders/AnimationEditorInputFix ... Fix incorrect input event reference in animation_editor.cpp	2017-05-27 11:35:48 +02:00
Rémi Verschelde	94edf16272	Merge pull request #8929 from nunodonato/themecolors ... Added color presets for easy theme switching	2017-05-27 11:25:43 +02:00
Rémi Verschelde	2b25147450	Merge pull request #8928 from nunodonato/helpmenu ... Added an help menu	2017-05-27 11:25:09 +02:00
Carter Anderson	49c00bd19b	Fix incorrect input event reference in editor_profiler.cpp	2017-05-27 04:17:05 -05:00
Carter Anderson	3b05f2c74f	Fix incorrect input event reference in animation_editor.cpp	2017-05-27 04:05:15 -05:00
Juan Linietsky	f89641907f	-Added EXR supprot for HDR (no BC6 compression yet though) ... -Improvements to texture importer -Proper detection of S3TC compression modes, and added all modes to Image -Fixes to non-power of 2 compressed textures, which should all be supported by GLES3	2017-05-26 22:31:32 -03:00
Nuno Donato	fa5aa11898	Added color presets for easy theme switching ... Also tweaked the default colors (darker and less satured)	2017-05-26 17:16:15 +01:00
Nuno Donato	7661cb5a62	Added an help menu ... Also renamed the "tutorials" button in the script editor to be consistent with the help menu entry. Fixed #8921	2017-05-26 16:20:33 +01:00
Rémi Verschelde	ef66f8451c	Merge pull request #8901 from tagcup/path_editor_plugin ... Revive PathEditorPlugin.	2017-05-26 07:58:13 +02:00
Ferenc Arn	42de893f9a	Applied clang-format. ... Since PathEditorPlugin was commented out, it didn't get clang-format'ed.	2017-05-25 10:12:05 -05:00
Rémi Verschelde	6a332b3575	Merge pull request #8895 from nunodonato/newdefaultcolors ... Improved default colors for the new theme	2017-05-25 08:40:11 +02:00
Rémi Verschelde	cda7ced681	Merge pull request #8891 from nunodonato/newmenu ... Join text menus on the top-left, move shortcut buttons to new locations (Preliminary work towards achieving the changes discussed in #8865.)	2017-05-25 08:39:19 +02:00
Rémi Verschelde	6d0809b095	Merge pull request #8869 from Hinsbart/errors ... Fix errors on engine startup.	2017-05-25 08:37:48 +02:00
Ferenc Arn	fdf301e78b	Revive PathEditorPlugin. ... Adapted the plugin to recent changes in input classes and pool arrays. Fixed an out-of-bounds bug in the process. Doesn't display anything for a single point (existing issue).	2017-05-24 17:09:53 -05:00
Nuno Donato	78781355ac	Join text menus on the top-left, move shortcut buttons to new location	2017-05-24 22:08:07 +01:00
Nuno Donato	5c65547804	Improved default colors for the new theme ... Colors inspired from solarized themes. Also moved the theme settings to the Interface category.	2017-05-24 21:41:56 +01:00
George Marques	86ef71fc95	Fix crash when interacting with the 2d editor	2017-05-23 11:03:17 -03:00
Rémi Verschelde	a77e53b0a5	Merge pull request #8872 from volzhs/editor-theme-lineedit ... Fix disabled style of LineEdit	2017-05-23 08:42:52 +02:00
volzhs	de9fb136b1	Fix disabled style of LineEdit	2017-05-23 14:36:07 +09:00
Andreas Haas	4d8e45de17	Fix errors on engine startup. ... Fixes a bunch of the most spammy console errors introduced by recent refactorings: - `AudioServerState` does not exist, this was the reference to it in the source. The surrounding code made it clear that `AudioServerLayout` was meant to be used instead. - `StreamCSVTranslation` same here, it's the only reference. I went with `Translation` here, but I'm not 100% sure on this one. - Some methods have been moved from `Texture` to `Image`, but the old bindings were still there. - A few `name == ""` errors related to duplicating nodes.	2017-05-22 20:50:59 +02:00
Rémi Verschelde	ab938a930f	Merge pull request #8863 from volzhs/editor-theme-new-node ... Show description box on create new node window	2017-05-22 15:17:07 +02:00
Rémi Verschelde	712fcbebfb	Merge pull request #8861 from volzhs/editor-theme-filedialog ... Show disabled item with proper color on FileDialog of editor theme	2017-05-22 15:16:39 +02:00
volzhs	fab3c4308c	Show description box on create new node window	2017-05-22 21:39:10 +09:00
volzhs	ea78bcbe60	Show disabled item with proper color on FileDialog of editor theme ... Fix #8635	2017-05-22 20:07:13 +09:00
Zaven Muradyan	9bc044cee6	Fix 2d path editor controls. ... Fixes #502. This appears to have been broken due to a merge conflict after the InputEvents changes.	2017-05-21 14:35:27 -07:00
Juan Linietsky	5b3709d309	Removal of InputEvent as built-in Variant type.. ... this might cause bugs I haven't found yet..	2017-05-20 17:05:38 -03:00
Rémi Verschelde	c19902f753	Merge pull request #8838 from zlsa/master ... Export nested nodes in TileSet scenes; resolves #8819.	2017-05-20 09:50:33 +02:00
Rémi Verschelde	231511b2a6	Merge pull request #8631 from volzhs/editor-theme-custom ... New customizable editor theme	2017-05-20 07:16:11 +02:00
Jon Ross	c97c733779	Fix #8819. Adds _import_node() that, when used in conjunction with _import_scene, recurses through the scene tree and exports all available nodes.	2017-05-19 14:49:37 -07:00
Rémi Verschelde	0aede444ef	Merge pull request #8789 from Hinsbart/editor_shortcuts ... Editor: Make "open 2d/3d/script editor" shortcuts configurable.	2017-05-18 18:59:22 +02:00
Andreas Haas	3be8a94868	Editor: Make "open 2d/3d/script editor" shortcuts configurable. ... Also adds shortcuts for opening the AssetLib and for switching to the next/prev editor.	2017-05-18 18:36:16 +02:00
Rémi Verschelde	1877a31a86	Merge pull request #6941 from voithos/bezier-handle-deletion-shortcut ... Add the ability to delete bezier path handles.	2017-05-18 14:02:30 +02:00
Rémi Verschelde	871b6b5517	Merge pull request #8716 from Hinsbart/import-plugins ... Bring back EditorImportPlugin	2017-05-18 13:08:07 +02:00
Rémi Verschelde	787dad5ac4	Adapt tutorials (Godot Docs) icon to new design	2017-05-17 21:22:01 +02:00
Rémi Verschelde	519df0d34d	Use new Godot icon consistently everywhere	2017-05-17 19:53:59 +02:00
Rémi Verschelde	c3baf5eb3c	Fix two typos from previous commit ... Also cleanup comments on variant types.	2017-05-17 18:45:56 +02:00
Juan Linietsky	98a3296702	Removal of Image from Variant, converted to a Resource.	2017-05-17 07:37:45 -03:00
Rémi Verschelde	76289b5d5a	Merge pull request #8761 from noshyaar/pr2 ... AssetInstaller: fix toggling dir bug, scan after install	2017-05-15 08:01:32 +02:00
Rémi Verschelde	2065d30414	Merge pull request #8717 from damianday/master ... Fix natural sorting order in EditorFileDialog, FileDialog and EditorFileSystemDirectory	2017-05-15 07:54:02 +02:00
Poommetee Ketson	3ee1952e39	AssetInstaller: fix toggling dir bug, scan after install	2017-05-14 20:23:28 +07:00
Rémi Verschelde	e883cdafa6	Merge pull request #8719 from Hinsbart/settings_case ... Project Settings: Use capitalized properties.	2017-05-12 18:23:45 +02:00
Rémi Verschelde	14989caf14	Merge pull request #8702 from josempans/bug_fixing ... Fix click area for bool parameter	2017-05-12 18:19:43 +02:00
Rémi Verschelde	5e318493d1	Merge pull request #8699 from Faless/ipv6_disabled ... Fix Editor/Debugger connection problems.	2017-05-12 18:19:24 +02:00
Damian Day	f2564ca97f	Fix natural sorting order in EditorFileDialog, FileDialog and EditorFileSystemDirectory ... Make EditorFileDialog, FileDialog and EditorFileSystemDirectory alphanumerical sorting more natural Added a new method 'naturalnocasecmp_to' and comparator 'NaturalNoCaseComparator' to String. Fixes #8712.	2017-05-12 13:02:25 +01:00
Andreas Haas	c04604461d	Bring back EditorImportPlugin ... This adds a new implementation of the EditorImportPlugin class, allowing to leverage the new importing system via tool scripts. Will be especially useful when used together with GDNative, to support formats like fbx :)	2017-05-12 12:46:25 +02:00
Andreas Haas	162068640b	Project Settings: Use capitalized properties. ... There's been some inconsistency between the ProjectSettings and EditorSettings: One would use "snake_case_properties", the other "Capitalized Properties". This fixes that by also using capitalized properties for the project settings. (It's actually the default, so the line setting it to false was just removed..) Was there a strong reason for using snake_case here in the first place?	2017-05-11 22:54:54 +02:00
Jose M Pan	02f02972e8	Fix click area for bool parameter ... This fixes the issue #8551: VisualScript: can't change bool parameter in function call	2017-05-09 14:35:48 -03:00
Fabio Alessandrelli	3b123367a1	Display remote_host/port in network->debug settings	2017-05-09 15:05:47 +02:00
Fabio Alessandrelli	98eb58a93c	Allow selecting editor debug host and port. ... Possibly fixes various editor<->debugger connection related problems.	2017-05-09 15:05:45 +02:00
volzhs	bb81293047	New customizable editor theme	2017-05-09 17:46:54 +09:00
Marc Gilleron	aaf9cacf5f	Improved freelook ... - Fix movement input affecting all viewports even when clicking outside - Freelook up movement is now relative - Prevent tool shortcut conflict when moving - De-hardcode tool shortcuts (select, move, rotate, scale, wireframe) - Movement speed depends on zoom distance (like panning) - Mouse wheel controls speed (Blender-style) due to above point - Added zoom distance indicator, hides after short delay	2017-05-08 02:57:20 +02:00
Rémi Verschelde	66725d9b21	Merge pull request #8660 from Hinsbart/warp ... Spatial Editor: Mouse warping for orbit & freelook modes.	2017-05-07 15:06:35 +02:00
Rémi Verschelde	642a760952	Merge pull request #8639 from n-pigeon/new_script_dialog ... Reworked look and feel of Add Script Dialog also some bug fixes	2017-05-07 15:06:07 +02:00
toger5	304a1f5b5a	Implemented scrolling factor for smooth trackpad scrolling ... Working platforms platform: OSX, Windows. Support for almost all ui elements, including project list.	2017-05-07 14:23:56 +02:00
Rémi Verschelde	c8aea60324	Improve documentation of thirdparty code snippets	2017-05-07 11:42:37 +02:00
Przemysław Gołąb (n-pigeon)	2dc4b035a8	Reworked look and feel of Add Script Dialog. ... Untangled a lot of Controls logic code and placed it in one place. Which squashed few bugs and made code easier to maintain.	2017-05-06 15:52:39 +02:00
Andreas Haas	7839a89027	Spatial Editor: Mouse warping for orbit & freelook modes.	2017-05-06 14:46:42 +02:00
Will Nations	adafaf15aa	Fixing previous merger's "not" vs. "!" mistake in C++ (#8664) ... Also fix typo on the main editor confirmation prompt	2017-05-06 10:31:36 +02:00
Rémi Verschelde	63d02067de	Merge pull request #8616 from Zylann/fps_look ... Added 3D freelook navigation mode	2017-05-05 22:51:25 +02:00
Rémi Verschelde	0ba0eb2ff9	Merge pull request #8613 from magyar123/pr-debugger-display-objects ... Make script debugger display all kinds of objects	2017-05-05 22:48:42 +02:00
Rémi Verschelde	9437d610e1	Merge pull request #8556 from ippan/obj_import ... support obj with negative indices	2017-05-05 22:45:36 +02:00
Rémi Verschelde	1f9266cbff	Merge pull request #8532 from RameshRavone/patch-4 ... Separate distraction mode for scene & script editor	2017-05-05 22:40:57 +02:00
J08nY	243f059200	Fix template loading	2017-05-05 22:39:04 +02:00
Marc Gilleron	442006b4bf	Added 3D freelook navigation mode ... - Triggered by holding RMB - Can look around in FPS style - Can move with WASD - Movement speed accelerates over time - Can multiply speed with a modifier key to go faster or slower - Configurable in editor settings and shortcuts	2017-05-04 01:38:12 +02:00
volzhs	17e8e343fb	Revert "Add new editor and default theme (WIP)" ... This reverts commit f045efe007.	2017-05-03 06:19:15 +09:00
PanPan	3cdfac7ed2	support obj with negative indices	2017-05-02 19:43:01 +08:00
Rémi Verschelde	5a6ccce97d	Merge pull request #8612 from magyar123/pr-show-dict-contents ... Make property editor display dictionaries (read only)	2017-05-02 11:33:05 +02:00
Rémi Verschelde	acaa01dfa7	Merge pull request #8610 from akien-mga/project-file-extension ... Rename project file to "project.godot"	2017-05-02 11:32:48 +02:00
Rémi Verschelde	8e64b27585	Merge pull request #8592 from hikari-no-yume/scene_import_rigidonly_flag_master ... Scene importer: add -rigidonly flag for empties [master]	2017-05-02 11:32:25 +02:00
Rémi Verschelde	a37364620f	Merge pull request #8569 from volzhs/editor-theme-1 ... Fix to use editor theme instead of handling each UI	2017-05-02 11:28:52 +02:00
Rémi Verschelde	6b769ac625	Merge pull request #8559 from Paulb23/script_recent_files ... Added recent scripts to script editor	2017-05-02 11:27:57 +02:00
Rémi Verschelde	82fa41bce3	Merge pull request #8541 from RandomShaper/opt-out-capitalization ... Add setting to opt-out of capitalization in property inspectors	2017-05-02 11:25:27 +02:00
mbalint12	be5e02708d	Make script debugger display all kinds of objects	2017-05-01 19:47:06 +02:00
Rémi Verschelde	7ce8342ac5	Rename project file to "project.godot" ... Slimmed down variant from the reverted #8375. The rationale behind the name change is to give Godot's project file a unique extension (".godot") that can be registered on the OS to be associated with the Godot binary (OS registration not implemented here). This PR also adds the possibility to start the game or editor if launched with the project.godot passed as argument, which paves the way for allowing a similar behaviour on a double-click in the OS file manager (code originally by @Hinsbart). Closes #6915.	2017-05-01 17:50:19 +02:00
mbalint12	a542372642	Make property editor display dictionaries (read only)	2017-05-01 14:25:47 +02:00
Andrea Faulds	dd100374c1	Scene importer: add -rigidonly flag for empties (fixes #8430)	2017-04-30 16:26:23 +01:00
Rémi Verschelde	de7eba887e	Merge pull request #8572 from akien-mga/thirdparty ... Moving more thirdparty stuff (minizip, some single-file external libs) to the thirdparty directory	2017-04-29 22:57:49 +02:00
Juan Linietsky	6d2f985db4	Revert "Use .godot as file extension for project files."	2017-04-29 17:56:51 +02:00
Rémi Verschelde	2398eb6ed4	Move core thirdparty files to thirdparty/{minizip,misc}	2017-04-28 21:19:23 +02:00
Rémi Verschelde	0a613ff970	Add a few missing copyright headers	2017-04-28 20:16:30 +02:00
volzhs	3223305e5a	Fix to use editor theme instead of handling each UI	2017-04-28 22:42:52 +09:00
volzhs	be454ba2d6	Update editor theme	2017-04-28 11:01:17 +09:00
Paulb23	e37928bb50	Added recent scripts to script editor	2017-04-27 16:07:39 +01:00
Pedro J. Estébanez	7b315dc666	Add setting to opt-out of capitalization in the property inspector	2017-04-27 08:46:16 +02:00
Rémi Verschelde	d730ee66a4	Merge pull request #8515 from attilix/folder-file-manager ... Right-clicking a folder now gives the option Show in file manager	2017-04-27 08:11:05 +02:00
Rémi Verschelde	2feb24953c	Merge pull request #8520 from Hinsbart/tree_tooltips ... Tree: Ability to add tooltips to TreeItem buttons.	2017-04-27 08:10:11 +02:00
Rémi Verschelde	ed583ffa30	Merge pull request #8553 from Hinsbart/vs_fix ... Fix recognition of resource extensions.	2017-04-27 08:09:01 +02:00
Daniel J. Ramirez	f045efe007	Add new editor and default theme (WIP)	2017-04-27 08:04:57 +02:00
Andreas Haas	c530d8f43c	Fix recognition of resource extensions. ... Also removes a related debug print.	2017-04-26 23:07:23 +02:00
Andreas Haas	29999942a2	Tree: Ability to add tooltips to TreeItem buttons. ... Adds a tooltip parameter to `TreeItem::add_button()` and set a few tooltips in the Project settings and SceneTree dock.	2017-04-26 19:14:35 +02:00
Ramesh Ravone	204d3ccf5f	Separate fullscreen state for scene & script editor	2017-04-26 17:43:35 +05:30
Paulb23	c4ffe89204	Changed indent type settings	2017-04-26 12:14:03 +01:00
Rémi Verschelde	88d362b232	Merge pull request #8531 from RameshRavone/patch-5 ... Settings: Moving Poly Editor into Editors category	2017-04-26 08:14:04 +02:00
Ramesh Ravone	ff282571c6	Settings: Moving Poly Editor into Editors category	2017-04-25 17:48:08 +05:30
Paulb23	4b8152d599	Ability to Convert Case, issue 8079	2017-04-25 10:18:57 +01:00
Attilio Oliva	0af6c39f36	Right-clicking a folder in the FileSystem panel now gives the option Show in file manager	2017-04-24 22:18:24 +02:00
Rémi Verschelde	8c4b7fcbb6	Merge pull request #8500 from Paulb23/space_indent_fixes ... Space indent fixes	2017-04-24 12:01:29 +02:00
Rémi Verschelde	16f532a202	Merge pull request #8499 from Melix19/patch-3 ... Fix "Save/Delete Layout" text field goes outside of the popup	2017-04-24 12:01:00 +02:00
Rémi Verschelde	9acfb0782c	Merge pull request #8444 from magyar123/pr-complete-paths ... Script editor now automatically completes file paths in GDScript	2017-04-24 11:37:57 +02:00
Rémi Verschelde	68870af214	Merge pull request #8420 from magyar123/pr-script-files-as-base ... Added the ability to select files as base when creating scripts	2017-04-24 11:28:36 +02:00
Marco Melorio	d4082a8d92	Added a container to EditorNameDialog	2017-04-23 23:36:59 +02:00
Paulb23	165b7bab63	Fixed convert indent and trim whitespace on save	2017-04-23 19:19:30 +01:00
Paulb23	e7e1d65eb0	Fix cursor position on indent convert	2017-04-23 19:05:51 +01:00
Rémi Verschelde	515f92d03b	Fix property warnings and hide some debug prints ... "ALL IS GOOD" was a lie. In particular, removes verbose "path not recognized" false positive. The actual logic is to (somewhat naively) check all ResourceFormatLoaders and to pick the first good match, so no need to warn about the formats that do not match the type hint.	2017-04-23 11:17:32 +02:00
Rémi Verschelde	b474646de0	i18n: Add more assetlib strings to translate ... Fixes #8463.	2017-04-20 14:52:46 +02:00
Rémi Verschelde	cd69343ff1	i18n: Sync translation templates with current source	2017-04-20 14:52:46 +02:00
Rémi Verschelde	22b9c0207b	Merge pull request #8417 from neikeq/hello-there ... External editor improvements and fixes	2017-04-20 02:20:04 +02:00
Rémi Verschelde	367f21e123	Merge pull request #8359 from volzhs/script-filename-master ... Show script filename instead of thumbnail	2017-04-20 02:09:21 +02:00
mbalint12	71978685f9	Added autocomplete for file paths in the script editor	2017-04-18 17:22:01 +02:00
Rémi Verschelde	5237bc952d	Merge pull request #8424 from Paulb23/convert_indent ... Support for space indentation	2017-04-18 14:16:58 +02:00
Paulb23	c59bd79e02	Convert indent on save	2017-04-18 12:30:52 +01:00
Paulb23	84bca4e72f	Added support for space indentation	2017-04-18 12:30:46 +01:00
Rémi Verschelde	474f18512a	Merge pull request #8375 from Hinsbart/project_extension ... Use .godot as file extension for project files.	2017-04-17 23:28:15 +02:00
Andreas Haas	95fe6b5d8c	Merge pull request #8433 from neikeq/pr-fix-smth ... ScriptEditor: Fixes bug where menu option would be handled twice	2017-04-17 11:55:42 +02:00
Ignacio Etcheverry	97c385dbb8	ScriptEditor: Fixes bug where menu option would be handled twice	2017-04-17 02:45:56 +02:00
Ignacio Etcheverry	4b8568006d	External editor improvements and fixes ... Notable changes: - Now ScriptLanguages have the option to override the global external editor setting. If `ScriptLanguage::open_in_external_editor()` returns `ERR_UNAVAILABLE` (which it does by default), then the global external editor option will be used. - Added formatting to the external editor execution arguments. Now it's possible to write something like this: `{project} -g {file}:{line}:{col}`. - `VisualScript::get_member_line()` now can return the line of functions (well, it returns the id of the _Function_ node of the function). I guess there is nothing else we can get a "line" from. Fixes: - Fixes a bug where `ScriptEditor::script_goto_method()` would not work if the script is not already open in the built-in editor. - Fixes wrong DEFVAL for `cursor_set_column` and `cursor_set_line` in TextEdit. - `Script::get_member_line()` now returns -1 ("found nothing") by default.	2017-04-17 01:51:30 +02:00
Paulb23	95a2a7e525	Added ability to convert indent type	2017-04-16 17:21:45 +01:00
Andreas Haas	c06a2db63a	Use .godot as file extension for project files. ... Now project files don't have to be named "godot.cfg" anymore, they can have any name so as long as it ends with *.godot. Also godot will automatically start the editor now if launched with a project file as an argument. This allows for double-clicking of projects to open them :) Code-wise this should be complete, but there's still work to do: - Make a nice icon for godot projects. - Work on installers/packaging -> register the extension and icon with godot. - Update the 2.1 to 3.0 exporter. Tested on linux and windows so far.	2017-04-16 10:19:07 +02:00
Zaven Muradyan	5b3c0a502c	Add the ability to delete bezier path handles.	2017-04-16 01:02:58 -07:00
Andreas Haas	25f843f80e	Editor: decrease blending time for dialog dimming a little. ... Feels snappier now.	2017-04-16 09:33:26 +02:00
mbalint12	a3afec588c	Added the ability to select files as base when creating scripts	2017-04-15 23:29:09 +02:00
Andreas Haas	065261cceb	Merge pull request #8389 from volzhs/inspector-button-margin-master ... Make buttons closer in Inspector panel	2017-04-14 17:52:18 +02:00
Andreas Haas	4e7c5eb498	Merge pull request #8356 from volzhs/texture-view-master ... Prevent to take too much space for long vertical texture	2017-04-14 17:50:29 +02:00
Andreas Haas	58edf26500	Merge pull request #8374 from nunodonato/killimport ... Removed the deprecated Import menu from the main editor.	2017-04-14 17:50:16 +02:00
Jylhis	aa63fd1551	Fix #7262 ... Disable PopupMenu hiding in snap settings of the TextureRegion editor and Edit menu of the scene	2017-04-14 15:01:56 +03:00
volzhs	79182ced83	Make buttons closer in Inspector panel	2017-04-14 00:03:54 +09:00
Karroffel	3bc09da0b1	re-enabled obj import	2017-04-12 22:22:13 +02:00
Nuno Donato	2025672e7b	Removed the deprecated Import menu from the main editor.	2017-04-12 13:32:22 +01:00
volzhs	10608c0993	Show script filename instead of thumbnail	2017-04-12 00:07:35 +09:00
volzhs	c3e6759ca1	Prevent to take too much space for long vertical texture	2017-04-11 20:37:22 +09:00
Rémi Verschelde	8764659234	Merge pull request #8342 from volzhs/error-signal-dnd ... Fix signal error when starting editor	2017-04-10 08:29:41 +02:00
Sergey Pusnei	8589ca3903	Rename [gs]et_pos to [gs]et_position for Controls ... Control set_pos -> set_position Control set_global_pos -> set_global_position [gs]et_mouse_pos -> [gs]et_mouse_position [gs]et_global_mouse_pos -> [gs]et_global_mouse_position fixes #8005	2017-04-10 08:27:34 +02:00
volzhs	519c03e932	Fix signal error when starting editor ... need to merge #8198 to work properly	2017-04-10 13:00:08 +09:00
Juan Linietsky	fccf2816d4	-Fix eternal black screen on Windows ... -Disabled warnings on windows, need to properly set up warnings	2017-04-09 17:59:17 -03:00
Andreas Haas	0029440955	Fix warning message when EditorPlugin script is not in tool mode.	2017-04-09 10:33:03 +02:00
Juan Linietsky	4286aef693	Particle system is complete. Rejoice!	2017-04-08 22:40:06 -03:00
Rémi Verschelde	df61dc4b2b	Add "Godot Engine contributors" copyright line	2017-04-08 00:11:42 +02:00
Rémi Verschelde	fc45c1e6eb	i18n: Sync translations from Weblate	2017-04-07 20:33:31 +02:00
Rémi Verschelde	0a5c1eeb48	i18n: Add new translations for Greek, Dutch and Thai	2017-04-07 20:33:05 +02:00
Rémi Verschelde	486952857f	i18n: Update translation template	2017-04-07 20:31:00 +02:00
Juan Linietsky	74808ac4d9	New particle system, mostly working, some small features missing.	2017-04-06 23:49:27 -03:00
supaiku	d51fe99a8b	Fix highlight typo	2017-04-06 17:35:08 +02:00
Andreas Haas	df7ca7864b	Editor: Use GDScript as the default language in ScriptCreateDialog.	2017-04-06 14:26:36 +02:00
Martin Novak	9aa60ff15f	Fix typo which caused popup to display on incorrect coordinates.	2017-04-05 00:31:17 +02:00
Andreas Haas	e19ccbdc32	Editor: Swap Scene and Import tabs in dock. ... Swaps the ordering of those tabs. Now the editor defaults to displaying the scene tab instead of import, which I found a bit confusing.	2017-04-03 17:29:29 +02:00
volzhs	6ac4969cdd	Fix crash when change project settings	2017-04-03 17:57:50 +09:00
volzhs	a911b1f126	Make buttons closer in Scene tree	2017-04-03 15:50:16 +09:00
Rémi Verschelde	84bd039851	Merge pull request #8173 from RandomShaper/improve-tile-palette ... Several enhancements for the tile map editor	2017-03-30 10:29:46 +02:00
Juan Linietsky	000e873008	Merge pull request #8191 from eska014/webgl2-export ... WebGL 2 export per WebAssembly or asm.js	2017-03-29 15:21:52 +02:00
eska	7df7e9cc8b	WebGL 2 export per WebAssembly or asm.js	2017-03-29 13:27:43 +02:00
Pedro J. Estébanez	54abbc532f	Several enhancements for the tile map editor ... Allow sorting tile palette by name Allow hiding tile ids in tile palette	2017-03-27 10:45:02 +02:00
Rémi Verschelde	d4740a9853	Merge pull request #8169 from RandomShaper/fix-uniform-move ... Include uniform (Shift down) mode in only-one-Node2D dragging	2017-03-27 08:56:54 +02:00
Pedro J. Estébanez	e7fba3d273	Include uniform (Shift down) mode ... in only-one-Node2D dragging	2017-03-27 01:32:24 +02:00
Rémi Verschelde	af282b56fe	Fix bogus s/_md/D_METHOD/ affecting md5 stuff	2017-03-24 22:58:50 +01:00
Rémi Verschelde	fb46323022	Merge pull request #8115 from RandomShaper/improve-snapping ... Improved 2D snapping behavior	2017-03-24 22:51:12 +01:00
Rémi Verschelde	98baec6880	Merge pull request #8109 from RandomShaper/warped-panning ... Implement warped mouse panning for 2D & 3D editors	2017-03-24 22:50:39 +01:00
Rémi Verschelde	1ed8caa1bb	i-patch for Pirate language ... Credits to jo_ for the joke and hcorion for finding the typo: <hcorion> Hi all, I was busy translating godot to Pirate, and I noticed a spelling error, on line 1035 in platform/uwp/export/export.cpp it mis-spells certificate as certficate missing the extra i <jo_> hcorion: Nice catch. <jo_> If you make a PR, please call it 'i-patch for Pirate."	2017-03-24 21:59:32 +01:00
Rémi Verschelde	73eaf81c16	i18n: Sync templates and translations with current code ... Massive diff due to the tools/editor -> editor move. The real changes are the difference between those two:	2017-03-24 21:54:00 +01:00
Rémi Verschelde	debeee56f7	Fix typos in source code using codespell ... From https://github.com/lucasdemarchi/codespell	2017-03-24 21:45:31 +01:00
Pedro J. Estébanez	61d7ae3466	Improved 2D snapping behavior ... Make snapping affect nodes created by drag & drop Make snapping for a single Node2D refer to its pivot Refactor duplicate drag setup code Replace one occurrence of the old set_pos by set_position	2017-03-24 21:29:46 +01:00
Rémi Verschelde	c103f32ea3	Only assume HiDPI mode if DPI >= 192 and width > 2000 ... Also fix detection of single-column dock if width < 1200, it only worked with hidpi_mode=auto.	2017-03-24 18:04:57 +01:00
Juan Linietsky	efaeebab4d	Several fixes to Android exporter and port. ... Android seems to be working again!	2017-03-23 20:14:12 -03:00
Pedro J. Estébanez	f5004b78d0	Implement warped mouse panning for 2D & 3D editors ... Enabled by default as in Blender, but can be disabled separately for 2D & 3D; the core functionality is in Input so this could be reused or even exposed to scripts in the future	2017-03-22 21:36:52 +01:00
Juan Linietsky	c37fad650f	Export working (for linux at least)	2017-03-21 19:34:26 -03:00
Juan Linietsky	b5a06cecff	Export template management dialog. ... Missing download (need to discuss this!)	2017-03-21 08:42:06 -03:00
Rémi Verschelde	7eb8a67025	Merge pull request #8067 from Hinsbart/fix_ps_cross ... InputMap: Rename joypad button "PS X" to "PS Cross".	2017-03-18 14:52:55 +01:00
Rémi Verschelde	00c4782910	Merge pull request #8051 from RayKoopa/resizable_new_node_dialog ... Make Create New Node dialog resizable and burninate old dialog	2017-03-18 14:52:34 +01:00
Andreas Haas	f6a504fad4	InputMap: Rename joypad button "PS X" to "PS Cross".	2017-03-18 12:31:37 +01:00
Ray Koopa	c0c4ba4e94	Make Create New Node dialog resizable and burninate old dialog	2017-03-18 11:21:50 +01:00
Andreas Haas	7ec697695f	Editor: Fix "About" dialog ... Use a HBoxContainer instead of hardcoded positions.	2017-03-18 01:53:45 +01:00
Rémi Verschelde	52ddd9ac9c	Merge pull request #8017 from volzhs/fix-dnd-2d-viewport ... Fix drag and drop on 2d viewport	2017-03-13 16:25:07 +01:00
volzhs	4d0a75750f	Fix drag and drop on 2d viewport	2017-03-13 19:35:27 +09:00
Rémi Verschelde	0f429f8f9e	Merge pull request #7979 from RandomShaper/fix-sub-inheritance ... Fix node duplication in scene sub-inheritance	2017-03-13 11:00:58 +01:00
Pedro J. Estébanez	383dea5796	Fix node duplication in scene sub-inheritance	2017-03-09 01:19:40 +01:00
Andreas Haas	9080232f17	Editor: Dim UI when a WindowDialog is shown. ... Darkens the editor on WindowDialog popup. This adds the following new Editor settings: - interface/dim_editor_on_dialog_popup (true) # Enable/Disable editor dimming - interface/dim_amount (0.6) # Percentage of how much the editor will be darkened (0-1) - interface/dim_transition_time # The duration (in seconds) of the color blending effect (0-1), 0 is instant. Please test this thoroughly, I haven't yet seen a case where it fails to work properly but I'm sure I didn't test all windows of the editor :P	2017-03-06 20:14:41 +01:00
Rémi Verschelde	5dbf1809c6	A Whole New World (clang-format edition) ... I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code	2017-03-05 16:44:50 +01:00
Rémi Verschelde	e1c1d7d1d7	Add a bunch of missing Godot headers in own files	2017-03-05 15:47:28 +01:00
Rémi Verschelde	49c065d29c	Refactoring: rename tools/editor/ to editor/ ... The other subfolders of tools/ had already been moved to either editor/, misc/ or thirdparty/, so the hiding the editor code that deep was no longer meaningful.	2017-03-05 14:21:25 +01:00