Commit graph

361 commits

Author SHA1 Message Date
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
Juan Linietsky 8fce79aaee -Some fixes to code completion.
-Fix getter in code completion being displayed when it shouldn't
-Clean up preview generation for editors and exposed it as editor plugin
2017-08-28 00:04:24 -03:00
Rémi Verschelde 7e8a7dea2e Merge pull request #10667 from Zylann/freelook_inertia
Added freelook inertia
2017-08-28 00:06:25 +02:00
Juan Linietsky d23f323cde -Moved script run to editor, removed from project
-fixed to code completion
-fix shader crash bug reported by tagcup
2017-08-27 19:04:19 -03:00
Rémi Verschelde 7ad14e7a3e Dead code tells no tales 2017-08-27 22:13:45 +02:00
Juan Linietsky 37da8155a4 -Largely rewrote gridmap to simplify it
-Got editor working again
-Added a current-floor marker on selection
2017-08-27 16:02:00 -03:00
Rémi Verschelde bd282ff43f Use HTTPS URL for Godot's website in the headers 2017-08-27 14:16:55 +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
Hein-Pieter van Braam 9a1d9a41eb Add several missing Null checks in _notification
This fixes #6118
2017-08-26 22:50:15 +02: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
Juan Linietsky dd7145b778 -Split EditorPlugin into EditorPlugin and EditorInterface
-Added EditorInterface to EditorScript
-Added functions to save the scene to EditorInterface
2017-08-26 10:33:07 -03:00
Juan Linietsky fbfed97a1b Changed camera interpolation to work when LMB is pressed and no modifiers are pressed 2017-08-26 09:10:57 -03: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
Andreas Haas 6134d8741d Editor: Add some more translatable strings. 2017-08-25 18:49:45 +02: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
Juan Linietsky 36e0a72c77 -Code completion for enumerations
-Disabled GDNative and GDNativeScript so build compiles again
2017-08-24 00:06:56 -03:00
Rémi Verschelde 78d9936f8d Merge pull request #10573 from tagcup/gizmo_aabb_scaling_order
Fix the order of transformations for selection bounding box in spatial editor.
2017-08-23 08:10:53 +02:00
Ferenc Arn d9d9571c8c Fix the order of transformations for selection bounding box in spatial editor.
This was broken in #7438 where the ordering of scaling in Basis::scale() was fixed, but this line of code (which relied on the incorrect behavior) wasn't updated correctly.

Fixes #9894.
2017-08-22 20:05:41 -04:00
Pedro J. Estébanez c2a1f3b814 Add ability to undo auto-indent
Closes #10420.
2017-08-22 19:52:17 +02:00
Rémi Verschelde b759fc47e6 Merge pull request #10538 from groud/fix_useless_separator
Fix unneeded separator in Script Editor's Debug menu
2017-08-22 08:49:11 +02:00
Gilles Roudiere 5ea403c0ce Fix uneeded separator 2017-08-22 08:43:23 +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
Hein-Pieter van Braam 24bc47b179 Add null check to ScriptEditor get_current_tab_control() call
This fixes #10517
2017-08-22 02:35:04 +02:00
toger5 ce4eb30778 added setting to override the theme background with editor theme color 2017-08-21 23:19:27 +02:00
Wilson E. Alvarez 738d2ab969 Removed unnecessary assignments 2017-08-21 15:15:55 -04:00
Juan Linietsky 541fdffc0a Merge pull request #10319 from neikeq/pr-engine-editor-hint
Adds Engine::is_editor_hint() method
2017-08-20 12:55:46 -03:00
Rémi Verschelde f4e2baae7f Merge pull request #10476 from Paulb23/delete_current_line_issue_9643
Delete current line, issue 9643
2017-08-20 15:25:28 +02:00
Rémi Verschelde dca8df47b4 Merge pull request #10460 from Zylann/orbit_sensitivity
Added option for mouse orbit sensitivity
2017-08-20 15:24:35 +02:00
Rémi Verschelde 5627047c32 Merge pull request #10455 from groud/control_margin_fixes
Some control fixes and removed other useless lines
2017-08-20 15:24:00 +02:00
Paulb23 de95e65d10 Delete current line, issue 9643 2017-08-20 13:31:30 +01:00
Marc Gilleron a88c759ff1 Added option for mouse orbit sensitivity 2017-08-19 21:57:43 +02:00
Gilles Roudiere 06256cd778 Some control fixes and removed useless lines 2017-08-19 19:10:00 +02:00
toger5 475502e638 Removed style box border for script panel. Fixes #10410 2017-08-19 17:30:48 +02:00
Ignacio Etcheverry 90b8a5b71e Removes editor_hint from SceneTree 2017-08-19 01:29:45 +02:00
Juan Linietsky cbcf40bd31 -Volume sliders, mute, solo and fx bypass are functional, closes #9021
-Fixed tree reselect, makes reselecting an audio bux FX work
2017-08-18 18:21:53 -03:00
Juan Linietsky b20952ebff Update script signals in real-time when script changes. Fixes #8980 2017-08-18 16:44:03 -03:00
Juan Linietsky 72be8876ea Properly manage drawing of primitives when they lack an area, fixes #8930 2017-08-18 15:12:48 -03:00
Marcelo Fernandez eab850524e Add closest_power_of_2 func and implement mix_rate/latency on OS X 2017-08-17 19:51:13 -03:00
Rémi Verschelde 19aff15a1a Tilemap Editor: Setting to hide tile info in the menu bar
Based on e513ecb7a1.
2017-08-16 19:51:55 +02:00
Rémi Verschelde 5485233549 Merge pull request #10300 from H4kor/anchor
Show Anchor even when Control-Node is hidden
2017-08-16 17:34:33 +02:00
Rémi Verschelde b1ecaaa22b Merge pull request #10307 from Rubonnek/update-argument-names
Updated function argument names
2017-08-16 17:17:56 +02:00
Rémi Verschelde 6345347190 Merge pull request #10326 from kubecz3k/spatial-click-improve
spatial selection if subscene geometry is far from origin
2017-08-16 17:13:27 +02:00
Juan Linietsky 6380975ee2 Merge pull request #10166 from toger5/asset_lib_style_overrides
fixed loading old theme styleboxes.
2017-08-15 20:00:44 -03:00
Juan Linietsky 1ecb48b8c2 Changed anchor constants to enum, removed ANCHOR_CENTER, fixes #9889 2017-08-15 19:49:28 -03:00
kubecz3k 129ebca41d Merge pull request #9889 from groud/control_enhancements
Control node enhancements
2017-08-15 22:55:49 +02:00
Juan Linietsky cb0e357d0b Converting to MeshLibrary works again, fixes #8092 2017-08-15 11:41:17 -03:00
Jakub Grzesik 78e72c8e79 spatial selection if subscene geometry is far from origin 2017-08-14 09:53:46 +02:00
Gilles Roudiere 0041e08f74 Avoids inverted anchors
Add a push_opposite_anchor argument pushing the opposite anchor if
needed
2017-08-13 21:20:14 +02:00
Gilles Roudiere c26af6f2b7 Adds a function to set Anchors with a layout preset 2017-08-13 21:20:14 +02:00
Gilles Roudiere e8c83b31bd Added the possibility to move all anchors at once when they are clustered 2017-08-13 21:20:13 +02:00
Gilles Roudiere f5ff7e9fa0 Make anchors snap to each other 2017-08-13 21:20:13 +02:00
Gilles Roudiere b73613e1eb Displays percentages when dragging anchors 2017-08-13 21:20:13 +02:00
Gilles Roudiere 2032cb2522 Simplifies the canvas editor code 2017-08-13 21:20:13 +02:00
Gilles Roudiere 3264cea7ae Add lines to make understandable when anchors are snapped 2017-08-13 21:20:13 +02:00
Gilles Roudiere b329cb9c71 Snap anchors when dragged, depending on the zoom level 2017-08-13 21:20:13 +02:00
Gilles Roudiere fcff42dcb7 Make anchors draggable 2017-08-13 21:20:13 +02:00
Gilles Roudiere bd0384a9e9 Add anchor visualization 2017-08-13 21:20:13 +02:00
Gilles Roudiere 0d35d4d53b Replace GUI anchor type by a float between 0 and 1 2017-08-13 21:20:13 +02:00
Niko Abeler 07809c162f Showing anchor icon in editor if control-node is hidden (fixes #9542) 2017-08-13 17:35:59 +02:00
Wilson E. Alvarez 428f03cf06 Updated function argument names 2017-08-12 15:12:49 -04:00
Jakub Grzesik be8ae8df93 fix crash after click on MeshInstance with no owner
Due to how spatial selection works, after clicking on
MeshInstance that had no owner editor was crashing.
2017-08-11 19:59:30 +02:00
Rémi Verschelde c231bda520 Merge pull request #10240 from djrm/pr_hidden_tilemap_menu
Hide tilemap menu when no tilemap is selected
2017-08-11 10:43:07 +02:00
Rémi Verschelde bed66afee4 Merge pull request #10237 from Paulb23/convert_indent_save_issue_9841
Fixed undo when converting indent with no changes, issue 9841
2017-08-11 10:41:32 +02:00
Rémi Verschelde fd6b9d9ac7 Merge pull request #10231 from djrm/pr_fix_add_sprite_dialog
Improved add texture as node dialog
2017-08-11 10:40:46 +02:00
Daniel J. Ramirez e4a9233a83 Hide tilemap menu when no tilemap is selected 2017-08-10 14:48:48 -05:00
Paulb23 e91bde6521 Fixed undo when converting indent with no changes, issue 9841 2017-08-10 19:23:45 +01:00
Daniel J. Ramirez 03f62495ca Improved add texture as node dialog 2017-08-10 11:40:28 -05:00
Jakub Grzesik d2d62122e2 ability to click on spatial subscene to select it 2017-08-09 18:40:02 +02:00
Juan Linietsky dbb6a39722 Moved mirror and rotations to the tile mapen, to avoid taking up too much toolbar space, fixes #6461 2017-08-08 22:46:26 -03:00
Juan Linietsky 950b205609 Clean up canvas item when changing state, closes #5977 2017-08-08 21:12:32 -03:00
toger5 a9da258a65 fixed loading old theme styleboxes 2017-08-08 18:36:35 +02:00
Juan Linietsky 5e1116da4c Added proper local transform snapping, closes #4985 2017-08-08 07:55:21 -03:00
Juan Linietsky 1939e83a65 Attempt to resolve #4673 2017-08-08 07:13:17 -03:00
Juan Linietsky a0d969c560 Revert "fixed loading old theme styleboxes" 2017-08-07 16:00:34 -03:00
Rémi Verschelde 3121b3a4f4 Merge pull request #10141 from ISylvox/lower_case_godot_api
Makes all Godot API's Methods lower_case
2017-08-07 14:59:39 +02:00
Rémi Verschelde b31ba2f187 Merge pull request #10097 from toger5/asset_lib_style_overrides
fixed loading old theme styleboxes
2017-08-07 14:47:27 +02:00
Rémi Verschelde 722011bb75 Merge pull request #10082 from Noshyaar/pr-viewport2
SpatialEditor: fix "Top", overflow preview button
2017-08-07 14:42:31 +02:00
Rémi Verschelde 307a04268b Merge pull request #10078 from Noshyaar/pr-viewport
SpatialEditor: uniform min/max of fov,znear,zfar
2017-08-07 14:42:03 +02:00
Rémi Verschelde ebf19d72b5 Merge pull request #9878 from toger5/theme_border_settings_change
Theme border settings change + updating styles
2017-08-07 14:07:57 +02:00
Indah Sylvia 5ae78fdf6a Makes all Godot API's methods Lower Case 2017-08-07 18:24:35 +07:00
toger5 f035e4a24a fixed loading old theme styleboxes 2017-08-05 01:33:46 +02:00
Poommetee Ketson 1cc655a40d SpatialEditor: fix "Top", overflow preview button 2017-08-04 20:46:22 +07:00
toger5 3b2a4cc52a editor: update helps and script panel on theme could change. 2017-08-04 14:57:15 +02:00
Poommetee Ketson b8feae4db6 SpatialEditor: uniform min/max of fov,znear,zfar
Clamp FOV to [0.01, 179], Znear and Zfar to [0.01, 10000]
2017-08-04 18:23:10 +07:00
Andreas Haas 95da12212b
TileMap: Fix infinite loop when trying to bucket-delete empty tiles.
Right-clicking when the bucket tool is enabled means "erase all instances of this tile".
So it doesn't make sense to try doing this for empty tiles :P

Fixes #10065
2017-08-03 20:46:13 +02:00
Andreas Haas 708ddb05af
ScriptEditor: ctrl+click can open scenes/resources.
Closes #9654
2017-08-02 19:23:57 +02:00
Rémi Verschelde 85088275c5 Merge pull request #8209 from robertdhernandez/Texture-Region-Editor-Sync
Texture region now updates when changing an Atlas region rect
2017-08-01 00:15:37 +02:00
Poommetee Ketson 6dde105be7 SpatialEditor: fix transform dialog 2017-07-31 20:00:02 +07:00
Rémi Verschelde 76005a8e75 Style: Apply clang-format on all files
Thus fixing some invalid changes that had still made it to the master branch.
2017-07-30 22:53:40 +02:00
Jakub Grzesik ff5ffeafeb ScriptEditor -> 'script_close' signal hint correction 2017-07-29 14:22:06 +02:00
Rémi Verschelde a4c150d26c Merge pull request #9906 from Noshyaar/pr-theme
ThemeEditor: fix broken dialog
2017-07-28 11:14:21 +02:00
Poommetee Ketson 8350e4853e ThemeEditor: fix broken dialog 2017-07-27 14:17:02 +07:00
Rémi Verschelde f5c3ee595d Merge pull request #9852 from groud/canvas_editor_update
Some more CanvasItemEditor improvements
2017-07-27 08:52:07 +02:00
Marc Gilleron 754679da0a Initialize freelook shortcuts properly 2017-07-27 04:00:23 +02:00
Gilles Roudiere ffe2072741 Change the grid offset when the snap is set as relative 2017-07-25 21:10:43 +02:00
Rémi Verschelde 303370d03d Merge pull request #9702 from groud/canvas_editor_update
[WIP] Canvas editor code clean-up (and improvements)
2017-07-25 08:40:39 +02:00
Juan Linietsky 66009706c9 -Ability to set default import presets for type
-More presets for scene importer
-Option in scene importer to export root nodes as separate scenes
-Fixed MeshInstance preview
2017-07-23 18:50:25 -03:00
Rémi Verschelde bde84112d8 Merge pull request #9788 from Zylann/freelook_modifier
Added configurable modifier key to activate freelook
2017-07-23 13:15:46 +02:00
Rémi Verschelde ba7fdcfd02 Merge pull request #9762 from Paulb23/_scipt_close_tab_selection_issue_8400
Fixed script tab selection on file close, issue 8400
2017-07-23 13:09:59 +02:00
Rémi Verschelde 50ab88bf15 Merge pull request #9761 from Noshyaar/pr-fix
ScriptEditor: suppress get_child errors
2017-07-23 13:09:47 +02:00
Marc Gilleron 9d970b11ae Added configurable modifier key to activate freelook 2017-07-23 02:13:08 +02:00
Rémi Verschelde f0ab3283c0 Merge pull request #9749 from kubecz3k/animtree-slider-fix
AnimationTree nodes sliders fixes
2017-07-22 13:46:36 +02:00
Rémi Verschelde c4918ca76b Merge pull request #9717 from kubecz3k/plugin-methods-rename
Rename of two EditorPlugin methods
2017-07-22 13:35:05 +02:00
Paulb23 3906134003 Fixed script tab selection on file close, issue 8400 2017-07-22 10:23:19 +01:00
Poommetee Ketson 843589d9d1 ScriptEditor: suppress get_child errors 2017-07-22 14:02:34 +07:00
Jakub Grzesik 0fc4b04f51 AnimationTree nodes sliders fixes 2017-07-21 13:57:46 +02:00
Gilles Roudiere cb3fbf7d32 Make uniform resize possible with side (top, left, right, bottom)
handles.
2017-07-20 22:03:34 +02:00
Gilles Roudiere 2d9873e033 Replaced the hard-to-understand _select by _select_click_on_empty_area and _select_click_on_item.
Added some comments
Removed commented code or useless ones
2017-07-20 19:50:37 +02:00
Gilles Roudiere 0d4b0ecb57 Generalized _find_canvas_items_at_pos to remove _select_canvas_items_at_pos
Removed some useless parameters
Removed old comments
2017-07-20 19:50:37 +02:00
Jakub Grzesik 218b1c223d EditorPlugin methods and signals rename 2017-07-20 19:16:34 +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
Rémi Verschelde c5ba9d9b7c Merge pull request #9703 from Noshyaar/docs
Add object type hint for docs
2017-07-19 10:00:20 +02:00
Rémi Verschelde d4c73ea2b3 Merge pull request #9565 from kubecz3k/tool-signals
Make more informations available for Tool Plugins about the editor
2017-07-19 09:54:02 +02:00
Poommetee Ketson 49c7620326 Add object type hint for docs 2017-07-19 02:03:34 +07:00
Daniel J. Ramirez 337c1238b9 Fixed button flat behavior when not in normal state.
Also changed some buttons to flat mode
2017-07-18 11:03:06 -05:00
Jakub Grzesik 708d825001 Make available more informations about editor for Tool Plugins 2017-07-18 17:48:19 +02:00
Rémi Verschelde 5a42bbaace Merge pull request #9482 from Noshyaar/pr-ramp
Fix shrunk ColorPickers
2017-07-18 07:52:32 +02:00
Poommetee Ketson 668d00ff2d Fix ColorPicker to use theme constants 2017-07-18 09:43:16 +07:00
Juan Linietsky bbada82f80 -Reorganized all properties of project settings (Sorry, Again).
(Lot's of bloat accumulated, so it was time for clean up.)
-Made EditorSettings and ProjectSettings search more useful (search in sections too)
2017-07-17 22:18:58 -03:00
Rémi Verschelde 34c20248b3 Merge pull request #9577 from MarianoGnu/master
Add anchor shortcut to fit parent
2017-07-17 23:14:52 +02:00
Rémi Verschelde 4680effcb3 Merge pull request #9666 from toger5/betterFocusCanvasEditor
Focus box size fix for new theme
2017-07-17 22:36:20 +02:00
Rémi Verschelde 2b8342e308 Merge pull request #9652 from djrm/theme_fixes
Improvements and fixes for the default theme.
2017-07-17 22:36:00 +02:00
redtoorange b2d2116a3a Fixed bug that prevented creating polygons. 2017-07-17 22:17:39 +02: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
toger5 7556aacb03 focus box size fix for new theme 2017-07-16 20:07:06 +02:00
Juan Linietsky 2e73be99d8 Lots of work on Audio & Physics engine:
-Added new 3D stream player node
-Added ability for Area to capture sound from streams
-Added small features in physics to be able to properly guess distance to areas for sound
-Fixed 3D CollisionObject so shapes are added the same as in 2D, directly from children
-Fixed KinematicBody API to make it the same as 2D.
2017-07-15 08:32:34 -03:00
Rémi Verschelde e64b82ebfc Some more typo fixes for "threshold"
Looks like @reduz really does not like that word.
2017-07-15 12:01:46 +02:00
Mariano Suligoy 99bda42d4d Add anchor shortcut to fit parent
Also remove old Edit -> Expand to Parent menu option
2017-07-14 10:25:50 -03:00
Jakub Grzesik 98897d0415 Ability to toggle script panel visibility 2017-07-10 14:25:06 +02:00
Poommetee Ketson 2fd204c35e Refactor 'treshold' to 'threshold' 2017-07-08 22:24:56 +07:00
Rémi Verschelde 095f0c956e Fix wrong cast to Node2D instead of Control
As reported by @sanikoyes.
2017-07-08 09:42:48 +02:00
ducdetronquito 566655adc1 [#9292] Renamed Image.put_pixel() to set_pixel(). 2017-07-07 19:05:45 +02:00
Juan Linietsky bd9d98c172 Ability to set rotation and scaling pivot for controls. 2017-07-06 17:42:44 -03:00
Poommetee Ketson 3aff102fc3 ItemList: expose methods, in-editor items editing support 2017-07-04 20:12:33 +07:00
Rémi Verschelde e54c7d5715 Merge pull request #9457 from TwistedTwigleg/Fixed_Vector3_snap
Fixed syntax inconsistency in Vector3.snap and Vector3.snapped
2017-07-03 23:43:33 +02:00
Rémi Verschelde 1a2ea9ba1b Merge pull request #9465 from Zylann/curve_preview
Added Curve preview thumbnail
2017-07-03 23:28:23 +02:00
TwistedTwigleg 44ecfb028d Fixed syntax inconsistency in Vector3.snap and Vector3.snapped 2017-07-03 16:29:03 -04:00
Rémi Verschelde 71f6c96288 Script editor help: Prevent loading empty instances from layout 2017-07-02 12:31:34 +02:00
Marc Gilleron c4564233a8 Added Curve preview thumbnail 2017-07-02 01:52:47 +02:00
Rémi Verschelde 0ffb70f0bb Merge pull request #9463 from bojidar-bg/9461-fix-backcompat
Readd tilemap's shape_transform and bugfixes
2017-07-01 21:34:19 +02:00
Andreas Haas bb9daaccff
Animation Editor: Fix trying to stop playback without player.
Fixes #9280
2017-07-01 20:26:41 +02:00
Bojidar Marinov 4d2642b666 Readd tilemap's shape_transform and bugfixes
This reverts commit a808f53020.
2017-07-01 20:56:51 +03:00
Juan Linietsky a808f53020 Revert "Fix Tileset/tilemap issues related to my adding of one-way collisions to them" 2017-07-01 13:02:04 -03:00
Juan Linietsky 2a3e00c8c7 -Many fixes to VisualScript, fixed property names, etc.
-Added ability to set/get a field in GetSet, as well as assignment ops
-Added a Select node
-Fixed update bugs related to variable list and exported properties, closes #9458
2017-06-30 21:35:05 -03:00
Bojidar Marinov 80356f925c
Fix #9409, fixup #9370; tileset now has shape transform instead of offset
Fix bad return type in CollisionObject2D, Shape -> Shape2D. Was causing unintended null when casting. (9409)
Fix a misplaced ++ operator. (9370)
Fix merging with exiting tileset duplicating shapes. (9370)
2017-06-30 19:01:20 +03:00