| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | Merge pull request #2447 from TheHX/issue_1275 | Juan Linietsky | 2015-11-19 | 1 | -5/+6 | |
| |\ \ \ | | | | | | | | | Fix crash after undo when editing Polygon2D (#1275) | |||||
| | * | | | Fix issue #1275 | Franklin Sobrinho | 2015-11-02 | 1 | -5/+6 | |
| | | | | | ||||||
| * | | | | Merge pull request #2786 from neikeq/node_select_menu | Juan Linietsky | 2015-11-18 | 4 | -84/+393 | |
| |\ \ \ \ | | |_|/ | |/| | | Added selection menu to spatial and canvas editors | |||||
| | * | | | Added selection menu to spatial and canvas editors | neikeq | 2015-11-19 | 4 | -84/+393 | |
| | |/ / | ||||||
| * | | | Merge pull request #2702 from TheHX/fix_align_with_view | Juan Linietsky | 2015-11-18 | 1 | -5/+5 | |
| |\ \ \ | | | | | | | | | Fix 3D editor align with current view | |||||
| | * | | | Fix "Align with view" undo, fixes #1443 | Franklin Sobrinho | 2015-10-29 | 1 | -5/+5 | |
| | |/ / | ||||||
| * | | | Merge pull request #2707 from akien-mga/master | Juan Linietsky | 2015-11-18 | 1 | -4/+0 | |
| |\ \ \ | | | | | | | | | Cosmetic fixes to SCons buildsystem | |||||
| | * | | | Cosmetic fixes to SCons buildsystem | Rémi Verschelde | 2015-11-01 | 1 | -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_fix | Juan Linietsky | 2015-11-18 | 2 | -25/+167 | |
| |\ \ \ | | | | | | | | | Added missing saving support to animation editor. | |||||
| | * | | | Added missing saving support to animation editor. | Saracen | 2015-11-02 | 2 | -25/+167 | |
| | |/ / | ||||||
| * | | | Merge pull request #2717 from SaracenOne/light_baker_transluscent | Juan Linietsky | 2015-11-18 | 2 | -66/+106 | |
| |\ \ \ | | | | | | | | | Ignore alpha materials in baked light ray-tracer. | |||||
| | * | | | Ignore alpha materials in baked light ray-tracer. | Saracen | 2015-11-02 | 2 | -66/+106 | |
| | |/ / | ||||||
| * | | | Merge pull request #2815 from akien-mga/pr-tooltip-buttons-sample-library | Juan Linietsky | 2015-11-18 | 1 | -0/+4 | |
| |\ \ \ | | | | | | | | | Added tooltip for a few buttons in sample library editor | |||||
| | * | | | Added tooltip for a few buttons in sample library editor | Tybobobo | 2015-11-18 | 1 | -0/+4 | |
| | | | | | ||||||
| * | | | | Merge pull request #2626 from TheHX/editor_dialogs | Juan Linietsky | 2015-11-18 | 6 | -80/+66 | |
| |\ \ \ \ | | | | | | | | | | | Small fixes in some editor dialogs | |||||
| | * | | | | Change MeshInstanceEditor outline dialog "Ok" button label | Franklin Sobrinho | 2015-10-18 | 1 | -1/+1 | |
| | | | | | | ||||||
| | * | | | | Small fixes in some editor dialogs | Franklin Sobrinho | 2015-10-18 | 6 | -79/+65 | |
| | | |/ / | |/| | | ||||||
| * | | | | Merge pull request #2631 from firefly2442/duplicate-conditional-fix | Juan Linietsky | 2015-11-18 | 1 | -1/+1 | |
| |\ \ \ \ | | | | | | | | | | | duplicate conditional check | |||||
| | * | | | | duplicate conditional check | firefly2442 | 2015-10-18 | 1 | -1/+1 | |
| | |/ / / | ||||||
| * | | | | Merge pull request #2639 from MarianoGnu/origin | Juan Linietsky | 2015-11-18 | 1 | -19/+17 | |
| |\ \ \ \ | |_|/ / |/| | | | Fix ButtonGroup broken layout | |||||
| | * | | | Fix ButtonGroup broken layout | MarianoGNU | 2015-10-19 | 1 | -19/+17 | |
| | |/ / | ||||||
| * | | | Merge pull request #2679 from eska014/set-all-tileset-shapes | Juan Linietsky | 2015-11-18 | 1 | -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 TileSets | eska | 2015-10-25 | 1 | -4/+8 | |
| | |/ / | ||||||
| * | | | *Polygon2D now updates on any modification in its point array. ShapeLine2D ↵ | Ovnuniarchos | 2015-11-18 | 1 | -0/+33 | |
| | | | | | | | | | | | | | has now an editor. | |||||
| * | | | -Fixed default theme a little | Juan Linietsky | 2015-11-18 | 1 | -2/+6 | |
| | | | | | | | | | | | | | -Added option to group help pages, fixes #2805 | |||||
| * | | | -Merged Script and Help tabs | Juan Linietsky | 2015-11-17 | 2 | -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 & playback | Juan Linietsky | 2015-11-09 | 2 | -2/+14 | |
| |/ / | | | | | | | -support for converting samples to ima-adpcm upon export | |||||
| * | | -Added const to a reference, should fix #2613 | Juan Linietsky | 2015-10-17 | 2 | -2/+2 | |
| | | | ||||||
| * | | Merge branch 'master' of https://github.com/okamstudio/godot | Juan Linietsky | 2015-10-17 | 2 | -729/+1187 | |
| |\ \ | ||||||
| | * \ | Merge pull request #2274 from MarianoGnu/master | Juan Linietsky | 2015-10-17 | 2 | -729/+1187 | |
| | |\ \ | | | | | | | | | Improve Visual Shader Editor responsiveness | |||||
| | | * \ | Merge branch 'master' of https://github.com/okamstudio/godot | MarianoGNU | 2015-10-16 | 8 | -605/+1478 | |
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | # Solved Conflicts: # tools/editor/property_editor.cpp | |||||
| | | * | | | Add missing icons, also make MSVC2010 happy | Mariano Javier Suligoy | 2015-08-30 | 1 | -4/+11 | |
| | | | | | | ||||||
| | | * | | | Merge branch 'master' of https://github.com/okamstudio/godot | Mariano Javier Suligoy | 2015-08-30 | 7 | -1/+72 | |
| | | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | | | | | | | # Solved Conflicts: # tools/editor/property_editor.cpp # tools/editor/property_editor.h | |||||
| | | * | | | Compile shaders using default values. | Mariano Javier Suligoy | 2015-08-30 | 1 | -8/+2 | |
| | | | | | | ||||||
| | | * | | | Edit default values. WARNING!!! | Mariano Javier Suligoy | 2015-08-29 | 2 | -49/+394 | |
| | | | | | | | | | | | | | | | | | | | | | Do not merge these changes, default values are not compiled into shaders yet! | |||||
| | | * | | | Merge branch 'master' of https://github.com/okamstudio/godot | Mariano Javier Suligoy | 2015-08-24 | 2 | -0/+140 | |
| | | |\ \ \ | ||||||
| | | * \ \ \ | Merge branch 'master' of https://github.com/okamstudio/godot | Mariano Javier Suligoy | 2015-08-09 | 1 | -0/+1 | |
| | | |\ \ \ \ | ||||||
| | | * \ \ \ \ | Merge branch 'master' of https://github.com/okamstudio/godot | Mariano Javier Suligoy | 2015-08-03 | 2 | -8/+11 | |
| | | |\ \ \ \ \ | ||||||
| | | * | | | | | | Delete selected nodes with the Delete key | Mariano Javier Suligoy | 2015-07-26 | 2 | -0/+42 | |
| | | | | | | | | | ||||||
| | | * | | | | | | Little fix: don't create an empty undo/redo command when trying to add a ↵ | Mariano Javier Suligoy | 2015-07-25 | 1 | -0/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | second Input GraphNode | |||||
| | | * | | | | | | Duplicate GraphNode(s) [Control+D] | Mariano Javier Suligoy | 2015-07-25 | 2 | -3/+42 | |
| | | | | | | | | | ||||||
| | | * | | | | | | Fix tab indent | Mariano Javier Suligoy | 2015-07-20 | 2 | -1808/+1808 | |
| | | | | | | | | | ||||||
| | | * | | | | | | Select and move multiple nodes at once | Mariano Javier Suligoy | 2015-07-19 | 2 | -1789/+1806 | |
| | | | | | | | | | ||||||
| | | * | | | | | | Use popup menu to add new nodes to the shader graph editor in the last ↵ | Mariano Javier Suligoy | 2015-07-16 | 2 | -16/+27 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | clicked location. | |||||
| * | | | | | | | | Merge branch 'master' of https://github.com/okamstudio/godot | Juan Linietsky | 2015-10-17 | 1 | -0/+3 | |
| |\| | | | | | | | ||||||
| | * | | | | | | | Merge pull request #2357 from volzhs/prevent-to-change-tool-mode | Juan Linietsky | 2015-10-17 | 1 | -0/+3 | |
| | |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | prevent to change tool mode when control key is pressed | |||||
| | | * | | | | | | remove shift key check because shift + v in use with tool mode | volzhs | 2015-08-11 | 1 | -2/+2 | |
| | | | | | | | | | ||||||
| | | * | | | | | | prevent to change tool mode when control or shift key is pressed | volzhs | 2015-08-11 | 1 | -0/+3 | |
| | | | |_|/ / / | | |/| | | | | ||||||
| * | / | | | | | misc cleanup | Juan Linietsky | 2015-10-17 | 3 | -3/+4 | |
| |/ / / / / / | ||||||
| * | | | | | | newline fixes | reduz | 2015-10-08 | 1 | -597/+597 | |
| | | | | | | | ||||||
