Commit graph

511 commits

Author SHA1 Message Date
Rémi Verschelde
6d16f2f053 Fix error macro calls not ending with semicolon
It's not necessary, but the vast majority of calls of error macros
do have an ending semicolon, so it's best to be consistent.
Most WARN_DEPRECATED calls did *not* have a semicolon, but there's
no reason for them to be treated differently.
2019-06-11 14:49:34 +02:00
Tomasz Chabora
f472f0491c Allow to change 2D pan hotkey 2019-06-05 22:44:52 +02:00
Rémi Verschelde
29645c8147
Merge pull request #27334 from qarmin/add_50_percent_editor_scale
Add support for 50% editor scale
2019-05-31 15:28:14 +02:00
Hugo Locurcio
ac14efcdfb
Decrease the editor FPS cap when the window is unfocused
This decreases CPU/GPU usage when the window is unfocused, which can
be beneficial to laptop users.

This also makes the low-processor mode sleep project setting no longer
affect the editor. Instead, two new editor settings now define the
duration of sleeping when the editor is focused and unfocused.

This closes #24209 and partially addresses #29257.
2019-05-30 15:42:57 +02:00
Rémi Verschelde
58f66fa848
Merge pull request #28107 from Amssat221/issue28105
Set range (10-50) to help source font size
2019-05-28 11:53:52 +02:00
Rémi Verschelde
92f67ceef3 i18n: Skip unsupported locales for editor translations
Godot currently can't properly render scripts that require Right-To-Left
and font shaping support, so we skip those.
This is a temporary measure until these features are supported.

Fixes #28577.
2019-05-21 14:38:46 +02:00
Rémi Verschelde
63e7d2db08
Merge pull request #28218 from KoBeWi/b00km4rk5
Add bookmarks for easier code navigation
2019-05-20 22:39:19 +02:00
Rémi Verschelde
79cc95c6a7
Merge pull request #27559 from groud/anchor_mode
Improve the anchors and margin workflow
2019-05-20 17:44:56 +02:00
Max Hilbrunner
ee5ba3e097
Merge pull request #28366 from iwek7/feature/issue28355/showSpacesInEditor
Add feature to show spaces in code editor
2019-05-17 20:38:40 +02:00
Max Hilbrunner
2522a43256
Merge pull request #27097 from siddharth952/master
Adjusts the default color for search border
2019-05-16 23:17:53 +02:00
Max Hilbrunner
bdf79f4c6e
Merge pull request #27569 from Faless/net/ipv4_link_local
Exclude link-local IPv4s from editor host list.
2019-05-14 16:08:16 +02:00
Gilles Roudiere
e875f05c3b Improve the anchors and margin workflow 2019-05-13 18:55:31 +02:00
Tomasz Chabora
0bfcf8bc2f Add bookmarks for easier code navigation 2019-05-05 18:57:53 +02:00
Siddharth
dc7533517f Update editor_settings.cpp
Update editor_settings.cpp

Update editor_themes.cpp

Update editor_settings.cpp
2019-05-02 18:23:37 +05:30
Guillermo
60e16e4a0d Set range and change EDITOR_DEF to EDITOR_GET
Fix indentation

Fix Indentation!

Remove 14
2019-04-30 20:14:39 +02:00
Rémi Verschelde
c1cc438ce6
Merge pull request #27913 from Amssat221/issue27912
Set a range for line spacing
2019-04-30 18:31:20 +02:00
Rémi Verschelde
9dc9434b1b
Merge pull request #24437 from mateusfccp/single_quotes_option
Add settings for single-quotes on completion
2019-04-30 14:58:33 +02:00
miwanczuk
fda3a568ef Issue-28355 - show spaces in editor 2019-04-30 14:57:48 +02:00
Rémi Verschelde
1ca65b5e26
Merge pull request #25751 from Calinou/faster-script-error-checking
Allow floating-point values in the idle parse delay editor setting
2019-04-30 13:47:52 +02:00
gsegovia2018
bab8c760e8 Set range for line spacing 2019-04-30 10:38:10 +02:00
Hugo Locurcio
2041e21eb5
Allow floating-point values in the idle parse delay editor setting
This also makes value changes effective without having to restart
the editor.
2019-04-26 00:01:20 +02:00
Rikhardur Bjarni Einarsson
9bfa63496a Added a marker in text_edit that tells which row is executing. 2019-04-23 21:51:01 +01:00
Paulb23
a6562cd004 Display connection information in the script editor 2019-04-20 13:13:54 +01:00
Juan Linietsky
a20235aeb0 Add ability to edit editor feature profiles
Allows enabling/disabling parts of the editor and storing/loading profiles for that.
2019-04-08 19:18:51 -03:00
qarmin
910bee9fa1 Add 50% scale in Godot 2019-04-07 21:16:36 +02:00
Hugo Locurcio
00799fc8c2
Add support for type hints in non-default script editor templates
This also refactors template processing to avoid repetition.

This closes #27074.
2019-04-05 23:19:30 +02:00
Fabio Alessandrelli
2bb39ac56e Exclude link-local IPv4s from editor host list.
IPv4 has link-local addresses like IPv6 (block 169.254.0.0/16).
Those addresses should not be considered a valid option when selecting
the `remote_host` setting for the debugger.
2019-03-31 16:57:23 +02:00
Hugo Locurcio
9ba6738719
Use the accent color to highlight selected text
This makes selections easier to see, while making them fit better
within the editor theme.

This closes #22552.
2019-03-27 22:12:41 +01:00
Rémi Verschelde
b17c8c0396 Fix misplaced hint for interface/theme/accent_color
Supersedes #26992.
2019-03-16 11:00:32 -07:00
Michael Alexsander Silva Dias
73aaf06be7 Cleanup relationship line coding after 5f079e2 2019-03-06 14:33:26 -03:00
Juan Linietsky
5f079e2ef9 -Make tileset and meshlibrary edit in a separate inspector, fixes #26671
-Made relationship lines appear based on theme settings, not previous hack
-Fix drawing of relationship lines (was broken)
-Fix double initialization of theme settings
2019-03-06 12:12:42 -03:00
Rémi Verschelde
3916a53522
Merge pull request #22716 from Chaosus/update_theme
Make theme changing no longer requires restart to be fully applied
2019-03-06 12:36:54 +01:00
Rémi Verschelde
c0050d9295 Fix creating editor data, config and cache paths
We used to abort if the system-specific data folder (e.g. `~/.local`
or `%APPDATA%`) is missing, but the next code chunk actually creates
it with `make_dir_recursive` if missing.

Fixes #26598.
2019-03-04 23:29:22 +01:00
Gilles Roudiere
de95493de2 Move the FileSystem dock layout properties to the per-project layout file 2019-02-25 23:39:49 +01:00
Hugo Locurcio
07e87f6ec0
Add a setting hint for the Output panel font size
This closes #21237.
2019-02-08 19:34:43 +01:00
Rémi Verschelde
b16c309f82 Update copyright statements to 2019
Happy new year to the wonderful Godot community!
2019-01-01 12:58:10 +01:00
Mateus Felipe C. C. Pinto
ca1935d6f7 Add settings for single-quotes on completion 2018-12-18 12:48:36 -02:00
Gleb Mineev
b675a3f745 24303: remember sorting order in the project manager 2018-12-15 17:38:49 +01:00
Rémi Verschelde
2f31d31c23
Revert "Use more subtle indentation guides in the script editor" 2018-12-13 19:57:34 +01:00
Rémi Verschelde
77dd0561ef EditorSettings: Remove unused settings from initial set
Fixes #24291.
2018-12-12 08:31:31 +01:00
Rémi Verschelde
fe68f53298 Code style: Sort EditorSettings initial set by section 2018-12-12 08:18:28 +01:00
Rémi Verschelde
3a312dbd32
Merge pull request #20725 from Calinou/textedit-subtle-indent-guides
Use more subtle indentation guides in the script editor
2018-12-09 23:10:32 +01:00
Rémi Verschelde
7439e55812
Merge pull request #23645 from Calinou/add-dynamicfont-antialias-option
Add a property to control DynamicFont anti-aliasing
2018-11-20 15:02:29 +01:00
Rémi Verschelde
563356109b Fixup to previous commit, missed one occurrence 2018-11-17 16:24:34 +01:00
Hugo Locurcio
fd89464d45
Add a property to control DynamicFont anti-aliasing
- Editor font anti-aliasing can now be disabled in the Editor Settings.
- DynamicFonts used in projects can now have their anti-aliasing
  disabled in their DynamicFontData child. Changes will be visible
  upon reloading the scene in the editor.
2018-11-10 22:07:32 +01:00
Rémi Verschelde
3282539e81
Merge pull request #22977 from CakHuri/draw_relationship_lines-ON
Made 'draw relationship lines' (at Editor Settings) enabled by default.
2018-11-01 10:46:15 +01:00
Chaosus
354272d41f Make theme changing no longer requires restart to be fully applied 2018-10-25 12:19:33 +03:00
Hugo Locurcio
976b3e3284
Increase the source font's line spacing
This also increases line spacing in license texts in the editor's
About dialog.
2018-10-14 21:39:49 +02:00
M. Huri
d4779c4ccf Made 'draw relationship lines' (at Editor Settings) enabled by default. 2018-10-13 14:36:38 +07:00
Michael Alexsander Silva Dias
1316595c96 Remove "Doc Path" setting 2018-10-02 22:17:31 -03:00
Hugo Locurcio
9c1d4f9da2
Use more subtle indentation guides in the script editor 2018-10-03 00:00:25 +02:00
Chaosus
943d0a90f5 Added viewport border color setting for canvas item editor 2018-09-24 16:16:40 +03:00
Rémi Verschelde
f0051394da Settings: Sort text editor themes alphabetically 2018-09-22 10:02:20 +02:00
groud
f19dfc1aa8 Remove auto disabling of the split-view in the FileSystem dock 2018-09-21 12:19:50 +02:00
Rémi Verschelde
69ee33896a
Merge pull request #21426 from groud/add_files_to_tree_view
Add files to tree view
2018-09-20 18:32:13 +02:00
groud
76b2ae8dc6 Fixes favorites not updating and rename favorite_dirs to favorites 2018-09-18 14:02:59 +02:00
Fabio Alessandrelli
0e56377e96 Allow system certs file to be used by Editor.
Note, it will only used by the Editor, not when running the game.
This allows package maintainer to compile Godot to use system installed
certificates when accessing the AssetLib.
2018-09-15 14:45:54 +02:00
groud
796418aa11 Merge the disable_split and show_files_in_tree settings 2018-09-14 10:22:07 +02:00
groud
b2633a97b9 Add thumnails to the tree view 2018-09-14 10:14:33 +02:00
groud
5f3bbbdc81 Add support for files in the tree view 2018-09-14 10:14:33 +02:00
Rémi Verschelde
52466d57e9 Make some debug prints verbose-only, remove others 2018-08-24 14:59:01 +02:00
Rémi Verschelde
de59fe04e7 Add print_verbose to print to stdout only in verbose mode
Equivalent of the cumbersome:
if (OS::get_singleton()->is_stdout_verbose())
	print_line(msg);
2018-08-24 09:23:20 +02:00
Rémi Verschelde
a752e2f4a3
Merge pull request #21150 from Calinou/more-window-placement-options
Add more project window placement options
2018-08-22 22:26:52 +02:00
Hugo Locurcio
475a46c59c
Add more project window placement options
It is now possible to use the previous or next monitor (relative to
the editor) to display running projects. If either end is reached,
it will wrap around to the last or first monitor (respectively).

This closes #20283.
2018-08-22 20:21:03 +02:00
Alexander Holland
5ba083ea1b changed search help selection color 2018-08-19 22:06:20 +02:00
Chaosus
66c25d4829 Added possibility to change color of 2d editor grid 2018-08-19 10:04:16 +03:00
Rémi Verschelde
1e49b2d720
Merge pull request #20997 from Gamblify/add_files_to_tree_view
Add a way to disable the split view in the FileSystem dock
2018-08-14 22:50:51 +02:00
groud
b3f02d0840 Add a way to disable the split view
Also add a parameter as the max height before split
2018-08-14 10:17:51 +02:00
Rémi Verschelde
12dd1435d2
Merge pull request #20952 from hpvb/fix-17963
When starting up try creating directories recursively
2018-08-14 09:20:14 +02:00
Hein-Pieter van Braam
321ac5ae13 When starting up try creating directories recursively
Previously we had a check to see if cache and data directories exist and
another check to try to make them if they do not. However the second
check was never reached if we don't have the directories in question.

Furthermore for cache directories on Linux people who never started a
desktop environment we need to recurisively create the XDG directory as
well as the godot specific directory.

This fixes #17963
2018-08-14 00:10:20 +02:00
Hugo Locurcio
24f39b08c7
Make the default text editor caret blink speed faster 2018-08-02 21:03:31 +02:00
Hein-Pieter van Braam
0e29f7974b Reduce unnecessary COW on Vector by make writing explicit
This commit makes operator[] on Vector const and adds a write proxy to it.  From
now on writes to Vectors need to happen through the .write proxy. So for
instance:

Vector<int> vec;
vec.push_back(10);
std::cout << vec[0] << std::endl;
vec.write[0] = 20;

Failing to use the .write proxy will cause a compilation error.

In addition COWable datatypes can now embed a CowData pointer to their data.
This means that String, CharString, and VMap no longer use or derive from
Vector.

_ALWAYS_INLINE_ and _FORCE_INLINE_ are now equivalent for debug and non-debug
builds. This is a lot faster for Vector in the editor and while running tests.
The reason why this difference used to exist is because force-inlined methods
used to give a bad debugging experience. After extensive testing with modern
compilers this is no longer the case.
2018-07-26 00:54:16 +02:00
Rémi Verschelde
4080e7ff8e
Merge pull request #20300 from Chaosus/editorsettings_fixes
Few fixes for editor tab in editor settings
2018-07-25 01:08:31 +02:00
George Marques
03746da73f
Add editor highlight for type-safe lines
The line number is hightlighted to indicate that the line contains only
type-safe code.
2018-07-20 21:55:18 -03:00
George Marques
75f395c2a0
Use type hints to improve completion
- Allow type hints to be completed.
- Use type information to infer completion candidates.
- Show typed function signature in tooltip.
- Add type hints when completing declaration from virtual functions
(optional).
2018-07-20 21:55:17 -03:00
Chaosus
982c4d7d5c Few fixes for editor tab in editor settings 2018-07-20 13:22:22 +03:00
Juan Linietsky
c69de2ba46 -Project/Editor settings now use new inspector
-Project/Editor settings now show tooltips properly
-Settings thar require restart now will show a restart warning
-Video driver is now visible all the time, can be changed easily
-Added function to request current video driver
2018-07-19 19:02:04 -03:00
Chaosus
f29f7bf0e7 Changed themes presets to String format 2018-06-23 18:38:01 +03:00
Paulb23
08c036b706 Removed duplicate default colours and removed GDScriptHighligher colours from main editor. 2018-06-13 18:25:02 +01:00
Paulb23
8f7e791ab6 Theme saving no longer hard coded 2018-06-13 18:21:44 +01:00
Rémi Verschelde
44050cd24f
Merge pull request #19503 from akien-mga/osx-ctrl-cmd
Fix shortcuts using KEY_MASK_CTRL instead of KEY_MASK_CMD
2018-06-13 15:43:54 +02:00
Chaosus
e1abb84524 Added Solarized Dark and Light themes 2018-06-13 16:05:04 +03:00
Rémi Verschelde
3f09cac267 Fix shortcuts using KEY_MASK_CTRL instead of KEY_MASK_CMD
KEY_MASK_CMD is automatically replaced by KEY_MASK_CTRL on non-OSX
and KEY_MASK_META (Command key) on OSX, so it should be used for all
Ctrl/Cmd + key shortcuts.

Also de-hacked the macOS shortcut replacements with proper conditional
definition. Not tested on macOS, cannot judge if they are good shortcuts.

Fixes #10761.
2018-06-11 07:53:28 +02:00
Michael Alexsander Silva Dias
e03de3ddfc Exposed set/get_project_metadata in EditorSettings. 2018-05-16 12:44:15 -03:00
Rémi Verschelde
98e5a3ea42
Merge pull request #18442 from StraToN/add-button-sort-methods-overview
Add a ToggleButton for alphabetic sorting in methods overview
2018-05-16 10:53:55 +02:00
Ian
e1fff4bc09 TextEdit word wrap 2018-05-14 16:17:48 -04:00
Martin Capitanio
1b8146f77b Editor: make custom bold font config working
Fixes #18737
2018-05-13 05:58:16 +02:00
Julian Murgia
68b9fd79e4 Add button hbox with alphabetic sort toggle above methods outline. 2018-05-11 13:30:43 +02:00
toger5
78af1e8dde fixed bodl font error message 2018-05-11 03:38:16 +02:00
Rémi Verschelde
919d802e66
Merge pull request #18183 from Paulb23/gdscript_highlighter_inital_changes
GDScript function definition and get_node shortcut syntax highlighting
2018-05-10 01:25:51 +02:00
Hugo Locurcio
ce7056bb8d
Fix the 3D grid color setting hints
It was mistakenly changed to RGBA in #18525 when it should have
stayed RGB (the 3D grid does not currently support transparency).
2018-05-08 13:57:51 +02:00
Juan Linietsky
8b9b653e76
Merge pull request #18113 from toger5/bold_font
added bold font to editor (support for coustom bold font)
2018-05-07 15:54:44 -03:00
Juan Linietsky
d8ea68195a
Merge pull request #18525 from Calinou/improve-3d-grid
Improve the 3D editor grid
2018-05-07 13:09:03 -03:00
Juan Linietsky
e68cbec1fa Make bones have more contrast with outline 2018-05-04 11:54:21 -03:00
Hugo Locurcio
098f9b51b5
Improve the 3D editor grid
- The grid's primary and secondary colors can now be changed
- The number of grid steps (subdivisions) can now be changed
- The grid size can now be changed
- The grid is now darker by default
2018-04-30 14:24:54 +02:00
Hugo Locurcio
0eb2f6c223
Tweak the property hint ranges of caret blink and line length guideline
This allows for more precise adjustments.
2018-04-28 19:13:30 +02:00
Paulb23
adeed58477 Added GDScript NodePath highlighting 2018-04-20 21:00:07 +01:00
Paulb23
4cd16f6ba9 Added GDScript function definition highlighting 2018-04-20 20:54:31 +01:00
toger5
29216b2bad added bold font to editor (support for coustom bold font) 2018-04-19 22:00:58 +02:00
Rémi Verschelde
fd79de01c2
Merge pull request #17706 from Calinou/overhaul-hidpi-settings
Overhaul the display scaling editor settings
2018-03-23 14:12:20 +01:00
Hugo Locurcio
61bf0d10d5
Overhaul the display scaling editor settings
This adds more scaling options, in addition to a custom scaling option
which allows any scale between 0.75 and 3.0 to be used.
2018-03-23 14:04:39 +01:00
Rémi Verschelde
699325f9a1
Merge pull request #17505 from ArkDShiggy/invert_y-axis
add option to invert y-axis
2018-03-23 11:28:05 +01:00
Julien CATINEAU
57e6b8781c add option to invert y-axis 2018-03-20 08:03:38 +01:00
Rémi Verschelde
db289e0e85
Merge pull request #17420 from marcelofg55/fscache_err_checks
Added error checks for fscache saving
2018-03-14 09:21:31 +01:00
Marcelo Fernandez
06e537fec5 Added error checks for fscache saving 2018-03-13 13:15:03 -03:00
Hugo Locurcio
c1544c12ef
Add an hinting mode setting to DynamicFonts
- Editor font hinting can now be tweaked in the Editor Settings.
- DynamicFonts used in projects now have tweakable hinting settings
  in their DynamicFontData child. Changes will be visible upon
  reloading the scene in the editor.
2018-02-28 00:12:26 +01:00
Rémi Verschelde
0671035d4f
Merge pull request #15399 from poke1024/load-one-translation
Load needed editor translation only on demand
2018-02-14 17:04:44 +01:00
Michael Alexsander Silva Dias
140340978b Changes for the "Recent Scripts" menu. 2018-02-02 15:34:36 -02:00
Razah
3455e43a13
maximum recent files increment fix 2018-01-25 00:52:49 +03:00
Juan Linietsky
702e28f265 Properly save the new save safe setting, avoid crash. 2018-01-12 17:18:40 -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
52165fa12d Fix bindings of EditorSettings.set_initial_value
Also ran doctool.
2018-01-09 16:52:46 +01:00
Rémi Verschelde
8f814e44bc
Merge pull request #15458 from volzhs/fix-editor-settings-1
Fix editor setting value is back to default
2018-01-08 10:55:09 +01:00
Rémi Verschelde
a385460a6e
Merge pull request #15457 from volzhs/custom-font-source-code
Set source code font with ttf, otf
2018-01-08 08:07:13 +01:00
volzhs
797147bd4b Set source code font with ttf, otf
renamed interface/editor/custom_font to interface/editor/main_font
moved text_editor/theme/font to interface/editor/code_font
renamed interface/editor/font_size to interface/editor/main_font_size
renamed interface/editor/source_code_size to interface/editor/code_font_size
2018-01-08 05:12:39 +09:00
volzhs
93a6be0320 Fix editor setting value is back to default
Fix #15449
2018-01-08 04:56:40 +09:00
Bernhard Liebl
7ef4caa691 Load needed translation on demand 2018-01-06 13:18:28 +01:00
volzhs
6ad43757ad Fix editor settings weird behavior 2018-01-06 20:54:00 +09: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
b997773b26
Merge pull request #15033 from poke1024/shortcuts-mac
Alternative keyboard shortcuts for macOS
2018-01-04 14:56:29 +01:00
Rémi Verschelde
edd78d54c4
Merge pull request #15073 from volzhs/editor-custom-font
Use .ttf or .otf file for editor custom font
2018-01-03 10:44:19 +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
2154f82302
Merge pull request #15152 from poke1024/editor-settings-change
Only send editor "settings_changed" if actually changed
2018-01-01 18:48:33 +07:00
Bernhard Liebl
62f3af9de1 Only send editor "settings_changed" if actually changed. 2017-12-29 11:03:29 +01:00
volzhs
4b0f075e95 Respect text editor highlighting color changes
Fix #14838
2017-12-28 23:49:15 +09:00
volzhs
2c8ebab93b Use .ttf or .otf file for editor custom font 2017-12-27 03:14:48 +09:00
Bernhard Liebl
3f122672a2 On macOS, change some default editor shortcuts 2017-12-26 11:24:12 +01: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
Rémi Verschelde
03823f12c5 EditorSettings: Move scene tab options to their dedicated category
Fixes #14870.
2017-12-20 19:41: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
f7238de9d4
Merge pull request #13994 from ISylvox/caret-blink
Set Caret Blinking Enabled by Default
2017-12-09 15:15:19 +01:00
Paulb23
48ad133cf9 Changed current line draw order and added code folding color 2017-12-07 19:17:43 +00:00
Gilles Roudiere
7b02f5591d Moves the guides colors to editor settings 2017-12-05 21:44:52 +01:00
Indah Sylvia
0102c861da Caret blinking is now enabled by default 2017-12-05 16:28:00 +07:00
Daniel J. Ramirez
4b80bc3303 Fixed editor settings disappearing (caused by uninitialized variable). 2017-11-29 22:04:41 -06:00
Juan Linietsky
22415e5a31
Merge pull request #12572 from RandomShaper/onion-skinning
Onion skinning
2017-11-26 15:13:35 -03:00
Hugo Locurcio
e3fc6fcaa6
Tweak the default editor camera settings
- The default FOV is now 70
- The default Z-near plane is now at 0.05 meters
2017-11-25 23:03:26 +01:00
Pedro J. Estébanez
d0e09d84f0 Implement onion skinning for the animation editor 2017-11-25 13:25:14 +01:00
Juan Linietsky
bc2e8d99e5 Made Vector::ptrw explicit for writing, compiler was sometimes using the wrong function,
leading to unnecesary copy on writes and reduced performance.
2017-11-25 00:09:40 -03:00
Rémi Verschelde
5ff84070ca
Merge pull request #13119 from YeldhamDev/export_path
Fixed not being able to use the "Open a Directory" dialog with the "Default Export Path" setting
2017-11-21 00:16:58 +01:00
Michael Alexsander Silva Dias
3fc684a111 Fixed not being able to use the "Open a Directory" dialog with the "Default Export Path" setting. 2017-11-20 21:10:42 -02:00
Ricardo Maes
77f21b63e9 Add simple spacebar panning setting for 2D editor 2017-11-20 22:53:14 +01:00
Daniel J. Ramirez
e07b9a8920 Fixed runtime EDITOR_DEFs being dropped. 2017-11-20 11:53:44 -06:00
Rémi Verschelde
d3889ad1b4 EditorSettings: Dehardcode major in config file name
It was readded in panic after I mistakenly removed the hardcoded "-3" in #12988,
forgetting that Windows would still use the same path and thus conflict with 2.1
(contrarily to macOS and Linux).
2017-11-20 07:40:06 +01:00
sersoong
fcbec6331c Change editor_settings.tres to editor_settings-3.tres 2017-11-20 11:02:34 +08:00
Rémi Verschelde
ecf80fbbba
Merge pull request #12988 from akien-mga/xdg-home-paths
Add support for XDG Base Directory spec
2017-11-20 00:42:51 +01:00
Rémi Verschelde
6e3f2f44af Use new XDG folders to dehardcode paths 2017-11-19 20:54:26 +01:00
Rémi Verschelde
32c12a92a5 Add initial support for the XDG Base Directory spec
Spec version 0.7 from https://standards.freedesktop.org/basedir-spec/basedir-spec-0.7.html
(latest as of this commit).

Three virtual methods are added to OS for the various XDG paths we will use:
- OS::get_data_path gives XDG_DATA_HOME, or if missing:
  ~/.local/share on X11, ~/Library/Application Support/ on macOS and %APPDATA% on Windows
- OS::get_config_path gives XDG_CONFIG_HOME, or if missing:
  ~/.config on X11, ~/Library/Application Support/ on macOS and %APPDATA% on Windows
- OS::get_cache_path gives XDG_CACHE_HOME, or if missing:
  ~/.cache on X11, ~/Library/Caches on macOS and %APPDATA% on Windows

So for Windows there are no changes, for Linux we follow the full split spec
and for macOS stuff will move from ~/.godot to ~/Library/Application Support/Godot.

Support for system-wide installation of templates on Unix was removed for now,
as it's a bit hackish and I don't think anyone uses it.

user:// will still be OS::get_data_path() + "/godot/app_userdata/$name" by
default, but when using the application/config/use_shared_user_dir option
it will now use XDG_DATA_HOME/$name, e.g. ~/.local/share/MyGame.

For now everything still goes in EditorSettings::get_settings_dir(), but
this will be changed in a later commit to make use of the new splitting
where relevant.

Part of #3513.
2017-11-19 20:54:24 +01:00
Ian
d350f506a0 TextEdit code folding 2017-11-17 21:49:43 -05:00
Daniel J. Ramirez
7154baa010 Avoid spamming the console for editor settings initial sets. 2017-11-17 14:23:44 -06:00
Rémi Verschelde
ad199c3964 EditorSettings: Rename settings_path to settings_dir
Also to prepare for upcoming refactoring for XDG support.
2017-11-17 20:55:09 +01:00
Daniel J. Ramirez
c57fc8ee7d Fixed editor settings disappearing.
Some items that are no longer defined may disappear, but thats expected i guess.
2017-11-09 22:10:48 -06:00
Rémi Verschelde
0438f4875d Some more harmonization of EditorSettings code 2017-10-31 23:36:03 +01:00
Rémi Verschelde
2d5de0b185 Reorder EditorSettings code for better legibility
No functional change, only moving stuff around.
2017-10-31 15:16:37 +01:00
Rémi Verschelde
981ef0be59 Add support for non-ISO locale identifiers via renames map
Windows apparently uses "no" for Norwegian Bokmål, even though its
ISO 639-1 language code is "nb"... Closes #12479.

Also did some non-intrusive cleanup while at it.
2017-10-30 00:02:55 +01:00
Rémi Verschelde
4af59c5b3f Merge pull request #12340 from homer666/orbit-inertia-toned-down
Reduce default orbit inertia value

[ci skip]
2017-10-24 09:11:50 +02:00
homer666
0be1c893b0 Reduce default orbit inertia value 2017-10-23 16:18:15 +11:00
Paulb23
45670df354 Added setting to toggle current line highlighting 2017-10-22 13:42:08 +01:00
Marc Gilleron
de42e53671 Freelook interpolation fixes
- Smooth freelook position more explicitely
- Don't let orbit zoom produce translation when it shouldn't
- Make base speed framerate-independent (and tweaked setting for that)
- Don't rely on camera for calculations because it no longer reflect immediate state
- Avoid potential divide-by-zero with zoom inertia
- Make speed/zoom relation optional (if enabled, speed is adjusted from zoom)
- Never change zoom distance when freelook is active
- Orbit inertia also applies on freelook
2017-10-10 02:38:17 +02:00
Poommetee Ketson
59def13b74 EditorSettings: remove duplicate set_favorite_dirs 2017-10-06 20:22:05 +07:00
Juan Linietsky
3d87b70f7a Added the set/get_setting function in Editor/Project settings. Renamed has() to has_setting. Fixes #11844 2017-10-05 15:34:34 -03:00
Poommetee Ketson
34ea271380 Merge pull request #11646 from djrm/pr_visual_improvements
Several visual improvements.
2017-10-02 23:49:44 +07:00
Andreas Haas
20eb17a685
EditorSettings: Move interface/ properties to interface/editor
Fixes inconsistent behaviour where clicking on the "Interface"
in the Editor Settings wouldn't collapse the category as is the
case for all the other categories.
2017-09-29 18:52:56 +02:00
Daniel J. Ramirez
15986ea343 Several visual improvements.
Added proper label sizing
Improved text editor status bar
Fixed some issues with ItemList and also some style fixes
Added background to color picker samples (the mrcdk fix)
Fixed slider ticks.
Added VS breakpoint and error styleboxes.
2017-09-28 15:00:43 -05:00
volzhs
3e0d18b9c0 Update theme property respectively 2017-09-26 20:08:25 +09:00
Daniel J. Ramirez
e2861a3b7c Removed transparency from spatial editor grid. 2017-09-25 21:45:53 -05:00
Daniel J. Ramirez
5676c42ae0 Added the ability to revert to initial value in editor settings. 2017-09-24 22:29:59 -05:00
Juan Linietsky
d3ea92257d -Fixed redraw always on 3D viewprot bug
-Changed manipulation inertia default values. Do not touch them again or I'll cut your fingers and eat them.
2017-09-23 17:28:28 -03:00
Marc Gilleron
b7bc339011 Allow to set a custom DynamicFont in editor settings 2017-09-23 16:17:44 +02:00
Unknown
9b50155009 freelook_base_speed calibration
freelook_base_speed changed from 0.5 to 0.1
Also precision changed from 0.1 to 0.01 so it's possible to set values lower than 0.1
2017-09-22 09:09:23 +02:00
Unknown
267c942121 rotation orbit modifier defaults to none 2017-09-21 17:45:42 +02:00
Rémi Verschelde
2f82da7f72 Merge pull request #11222 from toger5/spatial_scrolling
Spatial scrolling update + better default inertia values
2017-09-21 10:35:25 +02:00
Rémi Verschelde
34c4c8046c Merge pull request #11221 from toger5/editor_spacing
added editor spacing
2017-09-21 10:25:40 +02:00
Rémi Verschelde
752a116847 Merge pull request #11256 from djrm/pr_visual_improvements
Visual improvements and new look for VS
2017-09-19 23:44:09 +02:00
toger5
f328a356ae settings 'editors/3d' organized, sorted, new_defaults 2017-09-19 02:44:26 +02:00
toger5
117eb16adb update inertia/freelook settings values + renamed free_orbit... to
oribit...
2017-09-19 02:34:44 +02:00
toger5
81245a634b zoom inertia uses its own setting (not the same then translation) 2017-09-19 01:30:14 +02:00
toger5
8f460bb73d added editor spacing 2017-09-19 00:37:54 +02:00
Fabio Alessandrelli
72b4a09a14 Do not allow link-local addresses to be used by editor debugger
Default editor debugger address is now 127.0.0.1
2017-09-18 00:48:16 +02:00
Daniel J. Ramirez
ba11dc3f48 Added adaptive text editor theme, this includes the shader editor 2017-09-15 16:08:22 -05:00
Daniel J. Ramirez
74d028729f Improved VisualScriptEditor 2017-09-14 12:45:42 -05:00
Daniel J. Ramirez
d21f20eb5f Several fixed to editor doc.
Improved style
Fixed editor help issues
Added editor help index
2017-09-14 01:13:37 -05:00
Rémi Verschelde
22d9e56c71 Merge pull request #11199 from SaracenOne/filesystem_dirs
Add option to always show directories in filesystem dock
2017-09-13 20:20:35 +02:00
Daniel J. Ramirez
1e8048dd45 Improved theme generation, and other fixes 2017-09-12 13:16:38 -05:00
SaracenOne
7b5a1f6481 Add option to always show directories in filesystem dock 2017-09-12 18:23:16 +01:00
toger5
b1f804094d Modify inertia implementation for freelook and orbit
- freelook now uses position based inertia (holding a key for a
   specific time always rults in the same distance traveled independent
of inertia setting)
 - orbit inertia now is angle bases. (not transformation based) ->
   camera always takes the same path.
 - added setting for orbit inertia
 - added setting hints for freelook settings.
2017-09-07 15:55:58 +02:00
Rémi Verschelde
fb263b73aa Merge pull request #10901 from toger5/script_background_cleanup
StyleBoxSupport for RichTextLabel and cleanup for script+docs backgrounds fixes #10685
2017-09-04 08:05:17 +02:00
toger5
7cb76cd628 Revert "added setting to override the theme background with editor theme color"
This reverts commit ce4eb30778.
2017-09-02 03:55:23 +02:00
Paulb23
d586b98a20 Added setting to toggle auto indent 2017-08-31 19:42:47 +01:00
Rémi Verschelde
6889d4650a Merge pull request #10766 from poke1024/project-manager-dir
Adds default directory for default_project_path
2017-08-31 13:09:59 +02:00
poke1024
f2dc0c68fd Adds default directory for default_project_path 2017-08-31 07:15:17 +02:00
toger5
ff0a149de9 added setting for icon/font color: auto,dark,light 2017-08-30 21:47:10 +02:00
toger5
b2f70ca10c White Theme
- almost all the colors are generated now. They get adapted based on
   the theme color. All the correct icons are used
 - error label now uses error color
 - added missing button colors in editor theme
2017-08-30 21:44:48 +02:00
Rémi Verschelde
0f7376921f Merge pull request #10614 from poke1024/realtime-polygon-2d
Adds realtime updates to polygon 2d editing
2017-08-28 23:58:34 +02:00
Rémi Verschelde
7e8a7dea2e Merge pull request #10667 from Zylann/freelook_inertia
Added freelook inertia
2017-08-28 00:06:25 +02:00
Marc Gilleron
28e1c88f6e Added freelook inertia 2017-08-27 02:21:26 +02:00
Rémi Verschelde
612099e377 Merge pull request #10591 from Rubonnek/possible-null-ptr-dereference
Added/Fixed null pointer checks
2017-08-27 02:10:56 +02:00
Rémi Verschelde
5976e8d7de Merge pull request #10625 from Rubonnek/fixed-leaks
Fixed several memory leaks
2017-08-27 02:10:32 +02:00
Wilson E. Alvarez
7a07895920 Added/Fixed null pointer checks 2017-08-26 16:58:47 -04:00
Rémi Verschelde
565600e844 Cleanup tons of obsolete commented out code
Mostly in EditorNode, dropping some obsolete editor plugins and also a
cleanup of ProjectSettings/EditorSettings.
2017-08-26 17:47:57 +02:00
Bernhard Liebl
1ea2b9be72 polygon2d realtime editing
editing nodes in the polygon2d editor now updates the polygon in realtime; the previous outline is shown, but this can be disabled via a new editor setting
2017-08-26 11:57:54 +02:00
Juan Linietsky
1894157c9f -Massive clean up to gizmos
-Make sure handles are always visible (on top)
-Fixed instanced scene selection (should work properly now)
-Added interpolated camera
-Customizable gizmo colors in editor settings
2017-08-26 00:47:28 -03:00
Wilson E. Alvarez
1577f41653 Fixed several memory leaks 2017-08-25 08:47:05 -04:00
Hein-Pieter van Braam
cacced7e50 Convert Object::cast_to() to the static version
Currently we rely on some undefined behavior when Object->cast_to() gets
called with a Null pointer. This used to work fine with GCC < 6 but
newer versions of GCC remove all codepaths in which the this pointer is
Null. However, the non-static cast_to() was supposed to be null safe.

This patch makes cast_to() Null safe and removes the now redundant Null
checks where they existed.

It is explained in this article: https://www.viva64.com/en/b/0226/
2017-08-24 23:08:24 +02:00
Rémi Verschelde
c2346b92b2 Merge pull request #10507 from toger5/override_code_them_bg
added setting to override the theme background with editor theme color
2017-08-22 08:14:46 +02:00
toger5
ce4eb30778 added setting to override the theme background with editor theme color 2017-08-21 23:19:27 +02:00
Paulb23
d6599fde0a Increased smooth scroll speed and added user setting 2017-08-21 19:20:11 +01:00
Rémi Verschelde
35d5724519 Fix mismatched hints for filesystem/import/pvrtc_texture_tool 2017-08-20 22:23:58 +02:00
Marc Gilleron
ede58e48d8 Reduced default orbit sensitivity for smoother rotation 2017-08-20 18:22:45 +02:00
Rémi Verschelde
20ab8c1156 Merge pull request #10473 from akien-mga/run_window_placement_default
Rename "Default" window placement mode to "Top Left"
2017-08-20 15:25:14 +02:00
Rémi Verschelde
686294e4f2 Rename "Default" window placement mode to "Top Left"
It is no longer the default value ;)
2017-08-20 14:16:31 +02:00
Marc Gilleron
a88c759ff1 Added option for mouse orbit sensitivity 2017-08-19 21:57:43 +02:00
Paulb23
a142c9a2f0 Added smooth scrolling to TextEdit 2017-08-19 15:23:45 +01:00
Wilson E. Alvarez
428f03cf06 Updated function argument names 2017-08-12 15:12:49 -04:00
toger5
2ab512a07b Builtin script template loading improvements 2017-08-04 14:53:07 +02:00
Marc Gilleron
9d970b11ae Added configurable modifier key to activate freelook 2017-07-23 02:13:08 +02:00
Juan Linietsky
25678b1876 -Renamed GlobalConfig to ProjectSettings, makes more sense.
-Added system for feature overrides, it's pretty cool :)
2017-07-19 17:06:03 -03:00
Daniel J. Ramirez
a3c2d9a6bd Improvements and fixes for the default theme.
Added customizable border size and window highlight.
2017-07-16 13:23:59 -05:00
Andreas Haas
7ac2b6d3b3
Add default GDScript templates.
Adds some default templates, an empty one (that just extends the base class) and one without the comments.
Note: If you ran a previous build of Godot 3 before, remove or rename the script_templates folder in order to get these.
2017-07-12 20:54:12 +02:00
Rémi Verschelde
6fd4311c27 Change default color of script editor text selection
Supersedes and closes #9388.
2017-06-27 20:47:32 +02:00
Juan Linietsky
3ce046ee0c -Fixed SCREEN_TEXTURE and other related 2D shader parameters.
-Fixded BackBuffercopy object
2017-06-26 22:58:46 -03:00
Rémi Verschelde
4e12bf19cc Merge pull request #9304 from Noshyaar/pr-save
EditorNode: add Save/Discard/Cancel dialog
2017-06-26 23:29:39 +02:00
Poommetee Ketson
a9367ce6bc EditorNode: enhance save/quit dialog 2017-06-27 03:04:47 +07:00
Poommetee Ketson
e3998528e0 BuildSystem: generated files have .gen.extension 2017-06-25 07:55:01 +07:00
George Marques
7966ebe6fa
Complete changing of resource extensions
Some places were missing in e42d59f.
2017-06-16 15:42:18 -03: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
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
Andreas Haas
5f1603ca45
EditorSettings: Default game window placement to Centered.
Fixes #8890
2017-06-12 21:06:37 +02: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
d3afecf681 Merge pull request #8974 from Paulb23/script_overview
Added script overview
2017-06-05 15:42:12 +02:00
Paulb23
a4e222ae71 Added members overview 2017-05-29 12:56:33 +01: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
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
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
231511b2a6 Merge pull request #8631 from volzhs/editor-theme-custom
New customizable editor theme
2017-05-20 07:16:11 +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
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
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
1f9266cbff Merge pull request #8532 from RameshRavone/patch-4
Separate distraction mode for scene & script editor
2017-05-05 22:40:57 +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
Paulb23
e37928bb50 Added recent scripts to script editor 2017-04-27 16:07:39 +01:00
Daniel J. Ramirez
f045efe007 Add new editor and default theme (WIP) 2017-04-27 08:04:57 +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
Ramesh Ravone
ff282571c6
Settings: Moving Poly Editor into Editors category 2017-04-25 17:48:08 +05:30
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
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
mbalint12
71978685f9 Added autocomplete for file paths in the script editor 2017-04-18 17:22:01 +02:00
Paulb23
84bca4e72f Added support for space indentation 2017-04-18 12:30:46 +01:00
Andreas Haas
25f843f80e
Editor: decrease blending time for dialog dimming a little.
Feels snappier now.
2017-04-16 09:33:26 +02:00
Rémi Verschelde
df61dc4b2b Add "Godot Engine contributors" copyright line 2017-04-08 00:11:42 +02: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
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
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
Renamed from tools/editor/editor_settings.cpp (Browse further)