Commit graph

3514 commits

Author SHA1 Message Date
Rémi Verschelde
021421e180
Merge pull request #24782 from SoIAS/duplicated_code_24781
Removed duplicated code in animation_track_editor.cpp
2019-01-05 11:29:09 +01:00
Dawid Wdowiak
855a82211f Removed duplicated code 2019-01-04 22:18:54 +01:00
Rémi Verschelde
495e40cff8
Revert "Fix blend tree generating wrong node names" 2019-01-04 19:45:39 +01:00
Rémi Verschelde
5809be9641
Merge pull request #24582 from Xrayez/script-encrypt
Bring back script encryption in export preset
2019-01-04 16:34:38 +01:00
Rémi Verschelde
d54894ffae
Merge pull request #24647 from WindyDarian/gltf_morph_fix
Fix for blend shape incorrectly scaling skinned gltf mesh
2019-01-04 15:21:38 +01:00
Timo Schwarzer
163e0e3ebd
Add thumbnails to LargeTexture 2019-01-03 13:09:25 +01:00
Chaosus
be2bc4dab8 Improved script attachment/removal a bit 2019-01-02 16:56:11 +03:00
Rémi Verschelde
f1d1ecb383
Merge pull request #24686 from YeldhamDev/autotile_grid_separation_fix
Fix incorrect grid snapping in TileSet editor with separation
2019-01-01 19:04:04 +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
Rémi Verschelde
d1f3b622f0 Fix missing/malformed license headers 2019-01-01 12:46:36 +01:00
Michael Alexsander Silva Dias
07fdd2c702 Fix incorrect grid snapping in TileSet editor with separation 2018-12-31 13:36:51 -02:00
Chaosus
b26d2ac190 Fix "method not found" error when script is removed from object 2018-12-31 12:09:08 +03:00
Dawid Wdowiak
131001a4fb Fixed a property warning when loading a correct resource type
Fixed warning when loading a correct resource type to a property that could take more than one resource type.
2018-12-30 19:04:49 +01:00
Rémi Verschelde
ac46862097
Merge pull request #24506 from JFonS/expose_gizmos
Expose the new gizmo plugin system to scripting
2018-12-30 15:42:30 +01:00
Rémi Verschelde
1d7b69ebbc
Merge pull request #24664 from SoIAS/graph_node_headers_statemachine-24458
Removed graph node headers from state machine nodes
2018-12-30 14:06:58 +01:00
Michael Alexsander Silva Dias
4a91f94c13 Add undo-redo to the TileSet editor, and other improvements 2018-12-30 10:54:03 -02:00
Dawid Wdowiak
58ae20f239 Removed graph node headers from state machine nodes 2018-12-30 09:25:13 +01:00
Windy Darian
d9d6119b6e Partial fix for blend shape with gltf
This fixes https://github.com/godotengine/godot/issues/20377 , where blend shape scales the mesh if the mesh is also skinned.
The issue was that the blend shape was trying to blend using BLEND_SHAPE_MODE_RELATIVE (directly adding everything in morph shape as displacement), while bone weights were copied in the morph shape, which resulted in 2x bone weights causing mesh to become bigger when blended.
Setting the blend mode to BLEND_SHAPE_MODE_NORMALIZED while guaranteeing the data is correct fixes the issue (previously treating gltf2's morph displacement data as blend target data).  Ideally we still want to use BLEND_SHAPE_MODE_RELATIVE since it may need much less data, but that seems to require a larger refactor?
2018-12-29 01:13:35 -05:00
Rémi Verschelde
2e39e38c10 doc: Sync classref with current source
Fix various code formatting issues and argument names.
2018-12-27 11:10:18 +01:00
Rémi Verschelde
9c7ca687b2 Make error more explicit when OBJ/MTL files are missing
Fixes #24595.
2018-12-27 10:39:43 +01:00
Michael Alexsander Silva Dias
8aad7ef016 General fixes for the TileSet editor 2018-12-24 18:27:43 -02:00
Andrii Doroshenko (Xrayez)
ba13a2bc05 Bring back script encryption in export preset
Retrieved working implementation from 2.1 branch and adapted to
existing export preset system.

Added Script tab in export preset to export script as raw text,
compiled, or encrypted (same as in 2.1). The script encryption key is
visually validated. The script export mode and the key is saved per
per preset in `export_presets.cfg`, so it makes sense to ignore this
file in version control system.

Each custom exporting procedure can retrieve an export preset set
during project exporting. Refactored project export dialog a bit to
allow easier code comprehension.
2018-12-24 17:16:14 +02:00
Guilherme Felipe
8a202bc223 Fix blend tree generating wrong node names
Now it's possible to connect nodes again.
2018-12-22 12:18:04 -02:00
JFonS
6b15b4f904 Expose the new gizmo plugin system to scripting 2018-12-21 23:56:39 +01:00
Rémi Verschelde
616beb1041 ProjectManager: Warn when projects have different config_version
When opening projects for edition through the project manager, the
following checks are now done:

1. If the config_version is lower than the one used by the current
   engine version, users are asked if they want to convert to the new
   format or abort editing. Fixes #20626.
2. If the config_version is higher than the expected one (project
   from a more recent and incompatible engine version), projects are
   grayed out and can't be edited. Fixes #18758.

When editing from the command line, the behaviour is unchanged:
projects in situation (1) are automatically converted, while projects
in situation (2) show an error message (made more explicit).

The "Run" option from the project manager was not changed, so it will
still run (1) projects without converting them, and fail running (2)
projects.

Co-authored-by: groud <gilles.roudiere@gmail.com>
2018-12-21 12:45:27 +01:00
Rémi Verschelde
be8c0d57c5
Merge pull request #24519 from Chaosus/error_label_fix
Change LinkLabel back to Label in error status bar
2018-12-21 10:14:04 +01:00
Rémi Verschelde
f09956c86c
Merge pull request #24513 from YeldhamDev/fix_tileset_editor_draw
Fix small drawing error in TileSet editor
2018-12-21 10:09:00 +01:00
Chaosus
260b5818f1 Change LinkLabel back to Label in error status bar 2018-12-21 11:39:54 +03:00
Michael Alexsander Silva Dias
daf54133c2 Fix small drawing error in TileSet editor 2018-12-20 19:52:56 -02:00
Guilherme Felipe
21bad78bd8 Fixes for TileSetEditor and TileMapEditor
[TileSetEditor] Hide Bitmask and Priority for ATLAS_TILE
[TileMapEditor] Hide "Disable autotile" if the selected tile isn't
autotile
Fix #22756, don't update bitmask when tilemode is ATLAS_TILE
2018-12-20 15:31:45 -02:00
Rémi Verschelde
e8cdbf99e9 CodeEditor: Drop unused enable_complete_timer variable
Its use was removed in 1039ba9ffb.
2018-12-19 20:31:55 +01:00
Rémi Verschelde
26058376aa
Merge pull request #24462 from guilhermefelipecgs/fix_copy_paste_tilemap
Fix copy/paste for TileMap
2018-12-19 08:43:52 +01:00
Guilherme Felipe
06a929ace7 Fix copy/paste for TileMap
Fix #24440
2018-12-18 22:48:59 -02:00
Rémi Verschelde
3c999ae1a1
Merge pull request #24451 from mateusfccp/animation_editor_curve_tangent_different_color
Change color of AnimationPlayer curve to "highlight"
2018-12-18 18:56:05 +01:00
Michael Alexsander Silva Dias
2b278a5336 Small fixes for the AnimationTree editor 2018-12-18 15:24:22 -02:00
Mateus Felipe C. C. Pinto
e7968954e8 Change color of AnimationPlayer curve to "highlight"
This is to be consistent with Curve editor and to be less confusing
related to tangent lines color.
2018-12-18 13:46:03 -02:00
Rémi Verschelde
1039ba9ffb EditorSettings: Remove enable_code_completion_delay
It was badly named (it disables code completion, not just the delay), and also
badly implemented (not preventing the timer for running, but just preventing it
to show the autocompletion).

It could be readded with a proper name and cleaner implementation if there's an
actual need for it.

Supersedes #24407 and closes #24352.
2018-12-18 10:06:38 +01:00
Rémi Verschelde
1621270f26
Merge pull request #24432 from YeldhamDev/animationtree_editor_fixes
General fixes for the AnimationTree editor
2018-12-18 09:08:10 +01:00
Rémi Verschelde
75c6ad9756
Merge pull request #24427 from guilhermefelipecgs/fix_bread_crumb
Fix bread crumb of AnimationTree
2018-12-18 09:06:57 +01:00
Michael Alexsander Silva Dias
3c9ce2406b Make the AnimationTree editor's path section more obvious 2018-12-17 23:52:14 -02:00
Michael Alexsander Silva Dias
b86b497cec General fixes for the AnimationTree editor 2018-12-17 21:03:58 -02:00
Guilherme Felipe
317561863d Fix bread crumb of AnimationTree 2018-12-17 17:08:41 -02:00
Rémi Verschelde
28b10ea668 Fix sometimes uninitialized variable warning raised by Xcode 9.4.1
Fixes this warning raised by Travis CI on macOS:
```
editor/plugins/polygon_2d_editor_plugin.cpp:95:6: warning: variable 'skeleton' is used uninitialized whenever 'if' condition is true [-Wsometimes-uninitialized]
        if (!node->has_node(node->get_skeleton())) {
            ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
editor/plugins/polygon_2d_editor_plugin.cpp:106:7: note: uninitialized use occurs here
        if (!skeleton) {
             ^~~~~~~~
editor/plugins/polygon_2d_editor_plugin.cpp:95:2: note: remove the 'if' if its condition is always false
        if (!node->has_node(node->get_skeleton())) {
        ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
editor/plugins/polygon_2d_editor_plugin.cpp:94:22: note: initialize the variable 'skeleton' to silence this warning
        Skeleton2D *skeleton;
                            ^
                             = NULL
```
2018-12-17 12:28:11 +01:00
Rémi Verschelde
38f8269e1b
Merge pull request #24410 from YeldhamDev/graph_editors_title_fix
Fix titles in graph editors being invisible when headers are enabled
2018-12-17 08:10:20 +01:00
Michael Alexsander Silva Dias
9d4a996a08 Fix titles in graph editors being invisible when headers are enabled 2018-12-16 23:18:04 -02:00
Alexandre LittleWhite Laurent
ca90dd302b Change global timestamp behaviour earlier 2018-12-16 23:39:17 +01:00
Rémi Verschelde
74bf67c3a6 Ensure cursor is visible when EditorSpinSlider exits the tree
Supersedes and closes #22581.
2018-12-16 23:20:03 +01:00
Rémi Verschelde
4cf2d5bffe
Merge pull request #24405 from guilhermefelipecgs/fix_undo_fsm
Fix "undo" of the state machine losing node's position
2018-12-16 21:30:32 +01:00
Guilherme Felipe
bcd2659a2f Fix "undo" of the state machine losing node's position 2018-12-16 18:06:26 -02:00
Rémi Verschelde
169db6abdd
Merge pull request #24397 from volzhs/builtin-script
Create built-in script properly
2018-12-16 15:51:06 +01:00