aboutsummaryrefslogtreecommitdiff
path: root/tools/editor/plugins (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge pull request #2447 from TheHX/issue_1275Juan Linietsky2015-11-191-5/+6
|\ \ \ | | | | | | | | Fix crash after undo when editing Polygon2D (#1275)
| * | | Fix issue #1275Franklin Sobrinho2015-11-021-5/+6
| | | |
* | | | Merge pull request #2786 from neikeq/node_select_menuJuan Linietsky2015-11-184-84/+393
|\ \ \ \ | | |_|/ | |/| | Added selection menu to spatial and canvas editors
| * | | Added selection menu to spatial and canvas editorsneikeq2015-11-194-84/+393
| |/ /
* | | Merge pull request #2702 from TheHX/fix_align_with_viewJuan Linietsky2015-11-181-5/+5
|\ \ \ | | | | | | | | Fix 3D editor align with current view
| * | | Fix "Align with view" undo, fixes #1443Franklin Sobrinho2015-10-291-5/+5
| |/ /
* | | Merge pull request #2707 from akien-mga/masterJuan Linietsky2015-11-181-4/+0
|\ \ \ | | | | | | | | Cosmetic fixes to SCons buildsystem
| * | | Cosmetic fixes to SCons buildsystemRémi Verschelde2015-11-011-4/+0
| |/ / | | | | | | | | | | | | | | | - Removed trailing spaces - Made sure all indentation is done using tabs (fixes #39) - Potentially fixed an identation issue for openssl check
* | | Merge pull request #2716 from SaracenOne/animation_saving_fixJuan Linietsky2015-11-182-25/+167
|\ \ \ | | | | | | | | Added missing saving support to animation editor.
| * | | Added missing saving support to animation editor.Saracen2015-11-022-25/+167
| |/ /
* | | Merge pull request #2717 from SaracenOne/light_baker_transluscentJuan Linietsky2015-11-182-66/+106
|\ \ \ | | | | | | | | Ignore alpha materials in baked light ray-tracer.
| * | | Ignore alpha materials in baked light ray-tracer.Saracen2015-11-022-66/+106
| |/ /
* | | Merge pull request #2815 from akien-mga/pr-tooltip-buttons-sample-libraryJuan Linietsky2015-11-181-0/+4
|\ \ \ | | | | | | | | Added tooltip for a few buttons in sample library editor
| * | | Added tooltip for a few buttons in sample library editorTybobobo2015-11-181-0/+4
| | | |
* | | | Merge pull request #2626 from TheHX/editor_dialogsJuan Linietsky2015-11-186-80/+66
|\ \ \ \ | | | | | | | | | | Small fixes in some editor dialogs
| * | | | Change MeshInstanceEditor outline dialog "Ok" button labelFranklin Sobrinho2015-10-181-1/+1
| | | | |
| * | | | Small fixes in some editor dialogsFranklin Sobrinho2015-10-186-79/+65
| | |/ / | |/| |
* | | | Merge pull request #2631 from firefly2442/duplicate-conditional-fixJuan Linietsky2015-11-181-1/+1
|\ \ \ \ | | | | | | | | | | duplicate conditional check
| * | | | duplicate conditional checkfirefly24422015-10-181-1/+1
| |/ / /
* | | | Merge pull request #2639 from MarianoGnu/originJuan Linietsky2015-11-181-19/+17
|\ \ \ \ | |_|/ / |/| | | Fix ButtonGroup broken layout
| * | | Fix ButtonGroup broken layoutMarianoGNU2015-10-191-19/+17
| |/ /
* | | Merge pull request #2679 from eska014/set-all-tileset-shapesJuan Linietsky2015-11-181-4/+8
|\ \ \ | | | | | | | | Add all collision shapes to a tile when converting scenes to TileSets
| * | | Add all collision shapes to a tile when converting scenes to TileSetseska2015-10-251-4/+8
| |/ /
* | | *Polygon2D now updates on any modification in its point array. ShapeLine2D ↵Ovnuniarchos2015-11-181-0/+33
| | | | | | | | | | | | has now an editor.
* | | -Fixed default theme a littleJuan Linietsky2015-11-181-2/+6
| | | | | | | | | | | | -Added option to group help pages, fixes #2805
* | | -Merged Script and Help tabsJuan Linietsky2015-11-172-394/+949
| | | | | | | | | | | | | | | | | | -Help tabs can be opened many at the same time -Color temperatures for opened scripts -Dominant script opening when switching scene tab
* | | -support for stereo ima-adpcm sample compression & playbackJuan Linietsky2015-11-092-2/+14
|/ / | | | | | | -support for converting samples to ima-adpcm upon export
* | -Added const to a reference, should fix #2613Juan Linietsky2015-10-172-2/+2
| |
* | Merge branch 'master' of https://github.com/okamstudio/godotJuan Linietsky2015-10-172-729/+1187
|\ \
| * \ Merge pull request #2274 from MarianoGnu/masterJuan Linietsky2015-10-172-729/+1187
| |\ \ | | | | | | | | Improve Visual Shader Editor responsiveness
| | * \ Merge branch 'master' of https://github.com/okamstudio/godotMarianoGNU2015-10-168-605/+1478
| | |\ \ | | | | | | | | | | | | | | | | | | | | # Solved Conflicts: # tools/editor/property_editor.cpp
| | * | | Add missing icons, also make MSVC2010 happyMariano Javier Suligoy2015-08-301-4/+11
| | | | |
| | * | | Merge branch 'master' of https://github.com/okamstudio/godotMariano Javier Suligoy2015-08-307-1/+72
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | | | | | | # Solved Conflicts: # tools/editor/property_editor.cpp # tools/editor/property_editor.h
| | * | | Compile shaders using default values.Mariano Javier Suligoy2015-08-301-8/+2
| | | | |
| | * | | Edit default values. WARNING!!!Mariano Javier Suligoy2015-08-292-49/+394
| | | | | | | | | | | | | | | | | | | | Do not merge these changes, default values are not compiled into shaders yet!
| | * | | Merge branch 'master' of https://github.com/okamstudio/godotMariano Javier Suligoy2015-08-242-0/+140
| | |\ \ \
| | * \ \ \ Merge branch 'master' of https://github.com/okamstudio/godotMariano Javier Suligoy2015-08-091-0/+1
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'master' of https://github.com/okamstudio/godotMariano Javier Suligoy2015-08-032-8/+11
| | |\ \ \ \ \
| | * | | | | | Delete selected nodes with the Delete keyMariano Javier Suligoy2015-07-262-0/+42
| | | | | | | |
| | * | | | | | Little fix: don't create an empty undo/redo command when trying to add a ↵Mariano Javier Suligoy2015-07-251-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | second Input GraphNode
| | * | | | | | Duplicate GraphNode(s) [Control+D]Mariano Javier Suligoy2015-07-252-3/+42
| | | | | | | |
| | * | | | | | Fix tab indentMariano Javier Suligoy2015-07-202-1808/+1808
| | | | | | | |
| | * | | | | | Select and move multiple nodes at onceMariano Javier Suligoy2015-07-192-1789/+1806
| | | | | | | |
| | * | | | | | Use popup menu to add new nodes to the shader graph editor in the last ↵Mariano Javier Suligoy2015-07-162-16/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | clicked location.
* | | | | | | | Merge branch 'master' of https://github.com/okamstudio/godotJuan Linietsky2015-10-171-0/+3
|\| | | | | | |
| * | | | | | | Merge pull request #2357 from volzhs/prevent-to-change-tool-modeJuan Linietsky2015-10-171-0/+3
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | prevent to change tool mode when control key is pressed
| | * | | | | | remove shift key check because shift + v in use with tool modevolzhs2015-08-111-2/+2
| | | | | | | |
| | * | | | | | prevent to change tool mode when control or shift key is pressedvolzhs2015-08-111-0/+3
| | | |_|/ / / | | |/| | | |
* | / | | | | misc cleanupJuan Linietsky2015-10-173-3/+4
|/ / / / / /
* | | | | | newline fixesreduz2015-10-081-597/+597
| | | | | |