Commit graph

1805 commits

Author SHA1 Message Date
volzhs
14b46c4263 Check entered and trimmed path when create, import, install project
(cherry picked from commit 2d9e89ea2a)
2016-11-15 08:44:53 +01:00
volzhs
679e9f413c Fix crash when select target path on import 3d scene window
(cherry picked from commit b0cf201ea3)
2016-11-15 08:44:53 +01:00
volzhs
2d6dabc68e Prevent to select children if selection lock or instanced scene
Fix #7086

(cherry picked from commit c3f4d676c0)
2016-11-15 08:37:48 +01:00
volzhs
9219ac7e44 Fix resetting to default value in EditorSettings
(cherry picked from commit 70cce6152d)
2016-11-15 08:36:53 +01:00
Pawel Kowal
f1c2d70f1a Export immediately if only one device present
(cherry picked from commit 938f9388dd)
2016-11-15 08:35:01 +01:00
volzhs
7d09222b37 Set project name as directory name instead of '.'
(cherry picked from commit 571f33f863)
2016-11-15 08:34:38 +01:00
volzhs
dd8b87f58e Select newly created or imported project automatically
(cherry picked from commit b8f80e9450)
2016-11-15 08:34:32 +01:00
volzhs
64f38490df Prevent to make UndoRedo for duplicate if no selected node
(cherry picked from commit d82928eb49)
2016-11-15 08:29:56 +01:00
Keetz
86c6aabf27 Fix scene tree drag & drop places node as child (#6912)
(cherry picked from commit 2afcbc4b1f)
2016-11-15 08:28:52 +01:00
Saracen
e5f210693c Fixed flag for importing animation and skipping value tracks.
(cherry picked from commit 0063471edd)
2016-11-15 08:28:26 +01:00
Rémi Verschelde
eaf803f71e style: Various other PEP8 fixes in Python files
Done with `autopep8 --select=E7`, fixes:

- E701 - Put colon-separated compound statement on separate lines.
- E702 - Put semicolon-separated compound statement on separate lines.
- E703 - Put semicolon-separated compound statement on separate lines.
- E711 - Fix comparison with None.
- E712 - Fix (trivial case of) comparison with boolean.
- E713 - Fix (trivial case of) non-membership check.
- E721 - Fix various deprecated code (via lib2to3).
2016-11-02 22:30:34 +01:00
Rémi Verschelde
a7389217f8 style: Fix PEP8 blank lines issues in Python files
Done with `autopep8 --select=E3,W3`, fixes:

- E301 - Add missing blank line.
- E302 - Add missing 2 blank lines.
- E303 - Remove extra blank lines.
- E304 - Remove blank line following function decorator.
- E309 - Add missing blank line.
- W391 - Remove trailing blank lines.
2016-11-02 22:29:36 +01:00
Rémi Verschelde
e259bf8bbb style: Fix PEP8 whitespace issues in Python files
Done with `autopep8 --select=E2,W2`, fixes:

- E201 - Remove extraneous whitespace.
- E202 - Remove extraneous whitespace.
- E203 - Remove extraneous whitespace.
- E211 - Remove extraneous whitespace.
- E221 - Fix extraneous whitespace around keywords.
- E222 - Fix extraneous whitespace around keywords.
- E223 - Fix extraneous whitespace around keywords.
- E224 - Remove extraneous whitespace around operator.
- E225 - Fix missing whitespace around operator.
- E226 - Fix missing whitespace around operator.
- E227 - Fix missing whitespace around operator.
- E228 - Fix missing whitespace around operator.
- E231 - Add missing whitespace.
- E231 - Fix various deprecated code (via lib2to3).
- E241 - Fix extraneous whitespace around keywords.
- E242 - Remove extraneous whitespace around operator.
- E251 - Remove whitespace around parameter '=' sign.
- E261 - Fix spacing after comment hash.
- E262 - Fix spacing after comment hash.
- E265 - Format block comments.
- E271 - Fix extraneous whitespace around keywords.
- E272 - Fix extraneous whitespace around keywords.
- E273 - Fix extraneous whitespace around keywords.
- E274 - Fix extraneous whitespace around keywords.
- W291 - Remove trailing whitespace.
- W293 - Remove trailing whitespace.
2016-11-02 22:28:28 +01:00
Rémi Verschelde
561c1f17a1 style: Start applying PEP8 to Python files, indentation issues
Done with `autopep8 --select=E1`, fixes:

- E101 - Reindent all lines.
- E112 - Fix under-indented comments.
- E113 - Fix over-indented comments.
- E115 - Fix under-indented comments.
- E116 - Fix over-indented comments.
- E121 - Fix a badly indented line.
- E122 - Fix a badly indented line.
- E123 - Fix a badly indented line.
- E124 - Fix a badly indented line.
- E125 - Fix indentation undistinguish from the next logical line.
- E126 - Fix a badly indented line.
- E127 - Fix a badly indented line.
- E128 - Fix a badly indented line.
- E129 - Fix a badly indented line.
2016-11-02 22:26:55 +01:00
Rémi Verschelde
c78aef5812 Fix usage of 3.0 naming API in 1038c1f8 2016-10-31 08:39:45 +01:00
volzhs
91af714d39 Fix memory leak with drag & drop on 2D viewport
(cherry picked from commit a7d492eb53)
2016-10-31 07:55:23 +01:00
Andreas Haas
5033fc92f4 Ability to drag script files from Filesystem dock to SceneTree dock.
Allows to attach scripts by dragging them onto the target Node.

(cherry picked from commit a3944e66da)
2016-10-31 07:55:03 +01:00
volzhs
1038c1f856 Improve drag and drop on 2D viewport
(cherry picked from commit eed9179ea3)
2016-10-31 07:53:31 +01:00
volzhs
d67bbd183e Fix p_index out of size error when closing script
(cherry picked from commit 707185d9d8)
2016-10-31 00:07:56 +01:00
volzhs
06c47e6f8a Remove dead code in FileSystemDock
(cherry picked from commit 9605a1d0da)
2016-10-31 00:02:12 +01:00
Henrique Lacreta Alves
58daf901f9 Prevent unwanted script editor input on game crash
Fixes #6530.
(cherry picked from commit 853d1ce9f3)
2016-10-31 00:01:11 +01:00
Rémi Verschelde
5a49e45d21 SCsub: Add python shebang as a hint for syntax highlighting
Also switch existing shebangs to "better" /usr/bin/env python.

(cherry picked from commit fc8ccd5b8c)
2016-10-30 14:51:34 +01:00
volzhs
9b71cae50f Add option for root node name on Import 3D scene window
(cherry picked from commit dd04ac7ba9)
2016-10-17 20:50:20 +02:00
Andreas Haas
a418304def Only show AnimationEditor automatically when an Animplayer is selected.
Previous behaviour was to show it when an AnimationPlayer has been detected in the scene, now you actually have to select it.
Fixes #6213

(cherry picked from commit 86fd40b06c)
2016-10-17 20:49:18 +02:00
Mateusz Adamczyk
17edff2f84 Possibility to write node path by hand in exported NodePath variable (#3486)
(cherry picked from commit cf4f3815b3)
2016-10-17 20:48:10 +02:00
volzhs
81bc271619 Replace a node with saved branch scene instance
(cherry picked from commit cc33c528eb)
2016-10-17 20:47:49 +02:00
Andreas Haas
4b6809a2b3 Refresh TextureRegionEditor when region has been changed externally.
Now the TextureRegionEditor updates when you change the region_rect either via the inspector or via
undo/redo.

Fixes #6772

(cherry picked from commit 094073e4b2)
2016-10-17 20:47:14 +02:00
Pawel Kowal
280728c0c7 New load icon, removed unused open icon
(cherry picked from commit ed1e71a77e)
2016-10-17 20:46:34 +02:00
Pedro J. Estébanez
3df8f79c9f Allow step for integer properties
Small readability improvement

(cherry picked from commit 7b293aa4d4)
2016-10-17 20:44:54 +02:00
Pedro J. Estébanez
99d82f3033 Make text column numbers one-based
Make one-based the column number on the code editor

Make one-based the column number for GDScript error messages

Make one-based the column number for shader code error messages

(cherry picked from commit 2f80965845)
2016-10-17 20:44:47 +02:00
Rémi Verschelde
3f941faf4d i18n: Sync translations from Weblate and merge with current code 2016-10-09 18:23:26 +02:00
Rémi Verschelde
b3bf3c392a i18n: Fix string that broke msgmerge
(cherry picked from commit 2fb5a00305)
2016-10-09 18:21:59 +02:00
J08nY
1ae1deabfa editor_node: add an option to stop the update spinner from spinning, fixes #6653
(cherry picked from commit 4527fbcfa1)
2016-10-09 17:41:04 +02:00
Pedro J. Estébanez
22680a30f1 Fix reparent undo not renaming back
(cherry picked from commit 88a32c11f1)
2016-10-09 17:40:49 +02:00
Andreas Haas
a7d6894a9f Project manager: grab focus on ok button after path selection.
Slight usability improvement: grabs focus on the Import/Create button after engine.cfg/path selection.
So then I can just press enter to create the project ^^

(cherry picked from commit 36d2dd5318)
2016-10-09 17:40:10 +02:00
Răzvan Cosmin Rădulescu
6775cce469 fixes #6695 - MultiNodeEdit edit path in exported NodePath
(cherry picked from commit ced8fb4806)
2016-10-09 17:40:03 +02:00
Fabio Alessandrelli
d0ff75c91c Add shortcut to reset cursor position in 3D Editor ( #166 )
The shortcut will focus the origin after you moved around with shift + mouse3.
The default shortcut is the letter "O", like "F" for focus.
This can be customized in the editor shortcuts menu.

Closes #166

(cherry picked from commit 63abe3dcd0)
2016-10-09 17:39:00 +02:00
Andreas Haas
9593863a92 ConnectionDialog: Don't allow connecting to a Node without a script if target method is invalid.
Shows a warning now.
Fixes #6656

(cherry picked from commit 5b7021434f)
2016-10-09 17:34:12 +02:00
Pedro J. Estébanez
12d4d65668 Improve debug focus behavior
Fix focusing debugged game on Windows
Add re-focusing editor on continue

(cherry picked from commit 66dac878ac)
2016-10-09 17:29:59 +02:00
J08nY
f315d352ec PCKPacker: moved from tools into core, fixes #4129
(cherry picked from commit b1fba2e013)
2016-10-09 17:28:11 +02:00
Pedro J. Estébanez
de13e52b9b Respect texture .flags files on export
(cherry picked from commit 11cbbeb17e)
2016-10-09 17:24:10 +02:00
volzhs
73e7ccabf5 Fix typo for word_wrap
(cherry picked from commit c333659ebc)
2016-10-09 17:23:58 +02:00
Andreas Haas
02487a4be1 AnimationEditor: zoom using ctrl+wheel
closes #6585

(cherry picked from commit 3cce39c2d3)
2016-10-09 17:21:26 +02:00
George Marques
63b5a80088 Fix crash when disabling main screen plugin
(cherry picked from commit 0ec2b7baea)
2016-10-09 17:20:38 +02:00
Pawel Kowal
c8299249e4 Show True/False tooltip in property editor for bool values
(cherry picked from commit 623c483eba)
2016-10-09 17:18:43 +02:00
Andreas Haas
4084ec4869 Make the choosable default editor layout the same as the actual default one.
Fixes #6266

(cherry picked from commit a2bff72eee)
2016-10-09 17:18:02 +02:00
George Marques
6a0d47f34c Add a function to plugin get the main screen parent
- Fix a bug where the main screen button did not disappear when the plugin
  was deactivated.

(cherry picked from commit 98e7c1edba)
2016-10-09 17:12:15 +02:00
Paulb23
8dca3f3f42 Fix highlight current script when script temputure is disabled
(cherry picked from commit fbd0b6f995)
2016-09-18 23:21:48 +02:00
Paulb23
9b9870ed9f Update current script color on change
(cherry picked from commit a0136838b3)
2016-09-18 23:19:58 +02:00
Ralf Hölzemer
6c22cab856 Move hardcoded theme colors from editor_node into editor_themes
(cherry picked from commit 991a433cb3)
2016-09-18 23:13:46 +02:00
Paulb23
20c3b35dd5 Added customisable grid color, issue 3781
(cherry picked from commit a82ecf6d80)
2016-09-18 23:13:13 +02:00
Paulb23
aae720e488 Added setting to change current script background color, issue 5450
(cherry picked from commit 9e92fcaef9)
2016-09-18 23:12:15 +02:00
Geequlim
772a590261 Fix dialogs in ProjectManage don't with editor theme issue
(cherry picked from commit c1f23bb6af)
2016-09-18 23:11:50 +02:00
Pedro J. Estébanez
c44757c2b7 Expose light shadow color to canvas item shaders
(cherry picked from commit 0960887625)
2016-09-18 23:11:08 +02:00
Juan Linietsky
e0ddef3164 Do not expose resource/ properties in sectioned property editor, closes #6396
(cherry picked from commit 0094c30938)
2016-09-18 23:10:14 +02:00
supaiku
c007d31e52 Always show output panel when debugging
(cherry picked from commit 8514eaf34b)
2016-09-18 23:07:06 +02:00
volzhs
d6dc8f4644 Select newly created folder on Directory dialog
(cherry picked from commit 28a0ed75ba)
2016-09-18 23:06:46 +02:00
Rémi Verschelde
49dd7b38bc Remove tools/script_plugins, demos of the old plugin API
They are superseded by the official demos in
https://github.com/godotengine/godot-demo-projects/tree/master/plugins

(cherry picked from commit 3b3502b758)
2016-09-18 23:05:16 +02:00
Rémi Verschelde
bfcfb58efc Merge tools/docdump in tools/doc
Reduces clutter in the tools folder.

(cherry picked from commit 6a4ba76836)
2016-09-18 23:05:07 +02:00
Rémi Verschelde
ed96689d8c Move various scripts to the "scripts" folder
Thus cleaning up the "tools" folder a bit.

(cherry picked from commit ae9729b6df)
2016-09-18 23:05:00 +02:00
Rémi Verschelde
125a9f0b06 Remove obsolete Win32 libraries that everyone had forgotten about
(cherry picked from commit 08e5e8794a)
2016-09-18 23:04:52 +02:00
Rémi Verschelde
fd58f8dce8 Move templates and distribution stuff to tools/dist
Also removed the obsolete iOS xcode template.

(cherry picked from commit 3efe1231f0)
2016-09-18 23:04:26 +02:00
Joscha
e7772e43d3 Tilemap editor: Bucket tool - allow deleting and replacing of tiles
(cherry picked from commit acd41d964a)
2016-09-18 23:02:46 +02:00
Rémi Verschelde
2ab7e6daab i18n: Sync translations from Weblate
Translator credits added manually based on Weblate git log.
Adds Catalan, Danish and Norwegian Bokmål initial translations.

Those were initially translations for the master branch, merged
against the 2.1 template.
2016-09-01 19:33:28 +02:00
Mark Nokalt
a3a065b458 editor: Add mouse position information in TileMap
(cherry picked from commit cd71fcb097)
2016-09-01 08:46:23 +02:00
volzhs
265715f5b2 Show last added action on Input Map and implement InputEvent "=="
(cherry picked from commit 2e5a4cb5ca)
2016-09-01 08:45:37 +02:00
volzhs
cd8beea3bf Prevent to add node to selection when node is not inside tree
(cherry picked from commit 4857eabddb)
2016-09-01 08:45:15 +02:00
Ignacio Etcheverry
103b04e529 DocData: Fix null reference not detected correctly
(cherry picked from commit b81725b203)
2016-09-01 08:44:08 +02:00
Pedro J. Estébanez
cccc35e427 Improve/fix GridMap editor
Fix cursor/palette update on tile eyedropping
Fix editor not cleaning its state when becoming inactive, which leaves indicators behind among other issues
Fix/improve menu/keyboard shortcuts
Merge 'Gridmap Editor' and 'Grid Map' settings into the latter

(cherry picked from commit 7d35973486)
2016-09-01 08:41:31 +02:00
Ignacio Etcheverry
6a563949c7 DocData: Fix duplicated parenthesis for default values
(cherry picked from commit 9e6b53c8dd)
2016-09-01 08:41:12 +02:00
Franklin Sobrinho
f9aeb91850 Implemented UndoRedo mergeable modes
(cherry picked from commit debf574df3)
2016-09-01 08:41:04 +02:00
Franklin Sobrinho
5f9e6d2b48 Added add_property_info function to Globals and EditorSettings classes
(cherry picked from commit 9f242ed6e5)
2016-09-01 08:40:49 +02:00
Franklin Sobrinho
6327fc47c8 Better editor settings for the FileSystem dock
* Save the current display mode when changing it from the dock

(cherry picked from commit f6b39827b1)
2016-09-01 08:40:23 +02:00
Franklin Sobrinho
3cbd6b8701 Fix editor glitches when the mesh/material preview is shown
(cherry picked from commit a4c3d2dc89)
2016-09-01 08:40:16 +02:00
Franklin Sobrinho
4890db7fef Small usability improvements on the TileMap editor tile palette.
* The column width changes with the zoom, now the icons don't overlap.
  * Added a tile hsepation setting.
  * Added a setting to show/hide tile names.

(cherry picked from commit 0fa26cd850)
2016-09-01 08:40:08 +02:00
Franklin Sobrinho
743c63670e Expose additional functions for the EditorPlugin class
(cherry picked from commit 104653f9eb)
2016-09-01 08:39:52 +02:00
Daniel J. Ramirez
e26acc39da 2d collision shape icons now uses the color for shape icons
(cherry picked from commit cbad6b3fae)
2016-09-01 08:39:09 +02:00
Daniel J. Ramirez
16fc229e5d Zoom texture region via mouse wheel
(cherry picked from commit 1e7d0c6ac1)
2016-09-01 08:37:55 +02:00
Ignacio Etcheverry
4f07998552 Device Input dialog now uses containers
(cherry picked from commit 9483d3cbf9)
2016-09-01 08:34:05 +02:00
Rémi Verschelde
3b7ab73cab i18n: Merge PO files with current template 2016-08-10 21:31:06 +02:00
Rémi Verschelde
bbb543735c i18n: Sync template with current source 2016-08-10 21:30:57 +02:00
Rémi Verschelde
ed931d3b59 i18n: Sync translations from Weblate
Translator credits added manually based on Weblate git log.

(cherry picked from commit 221d81a26d)
2016-08-10 21:28:05 +02:00
Rémi Verschelde
676b60a8b5 i18n: Add a README file to point to the Weblate repo
(cherry picked from commit 807c615148)
2016-08-10 21:27:45 +02:00
Rémi Verschelde
9cc700a0ab OSX Info.plist: no longer dev version
This should really be dehardcoded somehow.
2016-08-09 09:51:58 +02:00
Ignacio Etcheverry
d853eb2fb7 Project Manager: Fix and improve unhandled input
(cherry picked from commit f3a75a42dd)
2016-08-08 18:15:03 +02:00
Andreas Haas
36eeedb357 Remove unused function in Project Manager.
This has been deprecated by #5993

(cherry picked from commit 0df40cc29b)
2016-08-08 18:14:57 +02:00
Saracen
dd97502788 TextureRegionEditor snap_mode fix.
(cherry picked from commit b578cf4da8)
2016-08-08 18:14:29 +02:00
Rémi Verschelde
3eb3752a59 Merge pull request #5993 from profelis/PR-scan-dragged-folder-2
Improved drad&drop files on project manager
2016-08-01 23:41:02 +02:00
Dima Granetchi
bee2091056
Auto import project folder, confirm scan multiple folders or non-project folder 2016-08-01 22:59:12 +03:00
Paulb23
d7910f44d8 Added Scene tree dock shortcuts 2016-08-01 17:02:40 +01:00
Rémi Verschelde
87e8444499 Merge pull request #5996 from hurikhan/editor_help_indentation
Fix help page title indentation
2016-08-01 10:56:56 +02:00
Mario Schlack
ae1267d41c Fix help page title indentation 2016-08-01 16:30:09 +08:00
Rémi Verschelde
0b595f94c4 Improve dialog title when scanning for projects 2016-07-31 20:46:00 +02:00
Rémi Verschelde
c788284b5c Merge pull request #5981 from profelis/PR-scan-dragged-folder
Drag open scan window if engine.cfg not found
2016-07-31 20:16:12 +02:00
Dima Granetchi
5e011dcd0e
dnd folder open scan window if engine.cfg not found 2016-07-31 01:10:13 +03:00
Dima Granetchi
a1c0fdac9a
fix run button availability check 2016-07-31 01:06:12 +03:00
Rémi Verschelde
38286670ac Merge pull request #5966 from neikeq/pr-issue-5935
Fix infinite loop when replacing text
2016-07-30 09:11:59 +02:00
Ignacio Etcheverry
6e137c02d2 Fix infinite loop when replacing text 2016-07-30 01:11:02 +02:00
Andreas Haas
9720e73e04
Project Manager: Import projects using filesystem drag'n'drop.
Can drop an engine.cfg file over the window to import it ;)
2016-07-29 17:07:05 +02:00
Saracen
5035edb7fd Explicitly initialize 'pending_auto_reload' to false. 2016-07-29 13:51:26 +01:00