aboutsummaryrefslogtreecommitdiff
path: root/tools/editor
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | Revert "Added toggle for loop interpolation based on adolson's code"Rémi Verschelde2016-06-263-26/+0
| |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commits 8884b8f51963553dd1ecc0bc4accf64deb4f645f bd5c8f2aa086c2cacc704dfef249c124760ab569 and 5cb31f6d5b667a551092b699de6f4786e0bb5b6d. <reduz> Akien, I understand the need for the second loop mode, but I think the current UI is pretty confusing. I think this should be changed for an enum, both there and in the animation.. otherwise we should revert it [...] <reduz> alternatively this could be added per track, which I think should make it a little less confusing Reopens #959..
* | | | | remove the warning of instances in use at exitJuan Linietsky2016-06-262-2/+2
| | | | |
* | | | | Fix error reporting when a scene is not imported properly, closes #3968Juan Linietsky2016-06-263-12/+18
| | | | |
* | | | | Revert "Fix issue when switching between FileSystem and other editor docks"Juan Linietsky2016-06-261-0/+1
| | | | |
* | | | | Merge pull request #5416 from samuelgrigolato/masterRémi Verschelde2016-06-261-1/+0
|\ \ \ \ \ | | | | | | | | | | | | Fix issue when switching between FileSystem and other editor docks
| * | | | | Fix issue when switching between FileSystem and other docks. #5384samuel.grigolato2016-06-251-1/+0
| |/ / / /
* | | | | Merge pull request #5307 from MarianoGnu/masterRémi Verschelde2016-06-269-355/+691
|\ \ \ \ \ | |/ / / / |/| | | | TextureRegion improvements
| * | | | Modify margins with mouse inputMarianoGNU2016-06-202-262/+300
| | | | |
| * | | | Chance Snap for SnapMode and add AutoSlice option.MarianoGNU2016-06-209-120/+418
| | | | |
* | | | | Merge pull request #5398 from djrm/shortcutsRémi Verschelde2016-06-251-12/+16
|\ \ \ \ \ | | | | | | | | | | | | Configurable shortcuts for tabs switching
| * | | | | Configurable shortcuts for tabs switchingDaniel J. Ramirez2016-06-241-12/+16
| | | | | |
* | | | | | Merge pull request #5397 from djrm/gizmos_fixRémi Verschelde2016-06-2515-158/+141
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Added high resolution icons for the Gizmos
| * | | | | Added high resolution icons for the Gizmos, fixes #1638Daniel J. Ramirez2016-06-2415-158/+141
| | |_|_|/ | |/| | |
* / | | | Fix network IP setting changevolzhs2016-06-241-1/+1
|/ / / / | | | | | | | | | | | | Fix #5368
* | | | Merge pull request #5360 from Paulb23/fix_script_save_as_issue_4210Rémi Verschelde2016-06-231-0/+1
|\ \ \ \ | | | | | | | | | | Fixed save as not working with scripts, issue 4210
| * | | | Fixed save as not working with scriptsPaulb232016-06-221-0/+1
| | | | |
* | | | | Merge pull request #5345 from djrm/fix_#5324Rémi Verschelde2016-06-231-3/+0
|\ \ \ \ \ | |/ / / / |/| | | | Fixed file name being removed on folder change in save as dialogs fix…
| * | | | Fixed file name being removed on folder change in save as dialogs fixes #5324Daniel J. Ramirez2016-06-201-3/+0
| | | | |
* | | | | Merge pull request #5344 from Paulb23/code_completion_colorsRémi Verschelde2016-06-223-0/+12
|\ \ \ \ \ | | | | | | | | | | | | Code completion box colors
| * | | | | Added code completion existing color settingPaulb232016-06-213-0/+4
| | | | | |
| * | | | | Added code completion selected color settingPaulb232016-06-213-0/+4
| | | | | |
| * | | | | Added code completion background color settingPaulb232016-06-213-0/+4
| |/ / / /
* | | | | Merge pull request #5274 from Paulb23/editor_file_dialog_shortcutsRémi Verschelde2016-06-221-24/+65
|\ \ \ \ \ | | | | | | | | | | | | Added editor file dialog shortcuts
| * | | | | Added editor file dialog shortcutsPaulb232016-06-191-24/+65
| | | | | |
* | | | | | Merge pull request #5282 from Hodes/masterRémi Verschelde2016-06-221-1/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | editor_node.cpp now takes care of removing plugin after deactivating it
| * | | | | | editor_node.cpp now takes care of removing plugin after deactivating ithodes2016-06-181-1/+4
| | | | | | |
* | | | | | | Fixed error using the same atlas rect for all images, closes #4139Juan Linietsky2016-06-212-2/+13
| | | | | | |
* | | | | | | Merge pull request #5336 from bojidar-bg/assetlib-additional-featuresRémi Verschelde2016-06-212-13/+66
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Assetlib additional features
| * | | | | | | Fix project manager category list, small enchancements as wellBojidar Marinov2016-06-212-3/+22
| | | | | | | |
| * | | | | | | Add support levels to searchBojidar Marinov2016-06-212-1/+27
| | | | | | | |
| * | | | | | | Check hashes when downloading assetsBojidar Marinov2016-06-212-10/+18
| | | | | | | |
* | | | | | | | Ability to premultiply alpha on font import, fixes #5231Juan Linietsky2016-06-211-0/+26
| | | | | | | |
* | | | | | | | Merge pull request #5326 from MarianoGnu/issuesRémi Verschelde2016-06-211-0/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Don't create outlines from dummy meshes. Fixes #4718
| * | | | | | | | Don't create outlines from dummy meshes. Fixes #4718MarianoGNU2016-06-201-0/+6
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Renamed Trackpad Hint to Emulate 3 Button Mouse. (#5258)sunnystormy2016-06-212-2/+2
| | | | | | | |
* | | | | | | | property remove parent owned nodes when using replace, fixes #4128Juan Linietsky2016-06-201-0/+12
| | | | | | | |
* | | | | | | | do not crash when generating preview of very large sound files, fixes #4123Juan Linietsky2016-06-202-12/+12
|/ / / / / / /
* | | | / / / Changed save all scripts shortcut to avoid collision, fixes #4278Juan Linietsky2016-06-201-1/+1
| |_|_|/ / / |/| | | | |
* | | | | | -Improved theme editor, when a new class is added, the members are created ↵Juan Linietsky2016-06-202-36/+50
| |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | empty, closes #4619 -Made theme editor take less vertical space by using a scroll area
* | | | | Merge pull request #5308 from MarianoGnu/issuesRémi Verschelde2016-06-201-13/+19
|\ \ \ \ \ | | | | | | | | | | | | ShaderEditor fixes
| * | | | | Remove unused connection. ShaderEditor should'nt handle ShaderGraphs.MarianoGNU2016-06-201-13/+19
| | | | | | | | | | | | | | | | | | | | | | | | Fixes #4678 && #4745
* | | | | | i18n: Improve a couple English stringsRémi Verschelde2016-06-202-2/+2
| | | | | |
* | | | | | -Added ability to disable overwrite warning on file dialog, fixes #4545Juan Linietsky2016-06-203-2/+21
|/ / / / /
* | | | | Make sure that scripts are reloaded if needed when they enter editing, fixes ↵Juan Linietsky2016-06-192-4/+16
| | | | | | | | | | | | | | | | | | | | #4456
* | | | | -Added options for scene import plugin to keep materials and user-added ↵Juan Linietsky2016-06-203-2/+172
| | | | | | | | | | | | | | | | | | | | tracks to animations, please test! closes #4425
* | | | | Merge pull request #5304 from djrm/shortcutsJuan Linietsky2016-06-192-20/+69
|\ \ \ \ \ | | | | | | | | | | | | switch tabs using ctrl+tab and ctrl-shift-tab, added shortcuts for scene tree dock
| * | | | | Added shortcuts to scene tree dockDaniel J. Ramirez2016-06-191-20/+57
| | | | | |
| * | | | | Switch tabs using CTRL+TAB and CTRL+SHIFT+TABDaniel J. Ramirez2016-06-191-0/+12
| | | | | |
* | | | | | Merge pull request #5303 from vnen/fix-delete-layoutRémi Verschelde2016-06-191-2/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Fix layout menu labels and shortcuts
| * | | | | Fix layout menu labels and shortcutsGeorge Marques2016-06-191-2/+2
| | | | | |