aboutsummaryrefslogtreecommitdiff
path: root/tools/editor
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Merge pull request #1580 from ↵Juan Linietsky2015-04-071-1/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | UsernameIsAReservedWord/fixes_help_background_color_theme fixes #332 : makes EditorHelp uses EditorSettings bg color
| * | | | | makes_editorhelp_uses_editor_settings_bg_coloryg2f2015-03-261-1/+3
| |/ / / / | | | | | | | | | | | | | | | | | | | | This fixes issue #332 by using the "text_editor/background_color" editor setting as background color for the EditorHelp.
* | | | | Merge pull request #1591 from MostafaHassan/pr_FixCrashInVisualShaderJuan Linietsky2015-04-071-1/+1
|\ \ \ \ \ | | | | | | | | | | | | (Fix crash) in visual shader for curve remap node
| * | | | | Fixed crash when trying to add keypoints and deleting them while holding ↵mostafahassan2015-03-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | mouse button down.
* | | | | | Merge pull request #1602 from TheHX/fix_issue_#1594Juan Linietsky2015-04-071-1/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix Issue #1594
| * | | | | | Better fixFranklin Sobrinho2015-04-031-0/+5
| | | | | | |
| * | | | | | fix_issue_#1594Franklin Sobrinho2015-04-021-2/+0
| | | | | | |
* | | | | | | Added a PVRTC encoder for iOSJuan Linietsky2015-04-061-1/+27
|/ / / / / /
* / / / / / merging okam changesJuan Linietsky2015-04-022-1/+38
|/ / / / /
* / / / / New node will be added to root node if nothing is selectedmostafahassan2015-03-311-4/+5
|/ / / /
* | | | crash bug solved, fixes #1560Juan Linietsky2015-03-231-1/+1
| | | |
* | | | android fixes, please testJuan Linietsky2015-03-231-0/+1
| | | | | | | | | | | | | | | | (can' t build android atm)
* | | | Merge branch 'master' of https://github.com/not-surt/godot into snapping2Carl Olsson2015-03-231-2/+2
|\| | |
| * | | fixes to new window management APIJuan Linietsky2015-03-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | -needs testing on Linux -needs testing on Windows -NEED SOMEONE TO IMPLEMENT IT ON OSX!! PLEASE HELP!
* | | | Add iostream include to collada plugin and change to light occluder to use ↵Carl Olsson2015-03-232-13/+3
| | | | | | | | | | | | | | | | canvas item snap function.
* | | | Merge branch 'master' of https://github.com/not-surt/godot into snapping2Carl Olsson2015-03-2328-161/+1295
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: tools/editor/plugins/canvas_item_editor_plugin.cpp tools/editor/plugins/canvas_item_editor_plugin.h
| * | | Merge pull request #1378 from erbridge/settings_not_checkboxJuan Linietsky2015-03-221-1/+1
| |\ \ \ | | | | | | | | | | Make View > Settings a non check item
| | * | | View > Settings isn't a check item.Felix Laurie von Massenbach2015-02-171-1/+1
| | | | |
| * | | | Merge pull request #1380 from ElectricSolstice/wparentheses_removalJuan Linietsky2015-03-221-3/+5
| |\ \ \ \ | | | | | | | | | | | | Changed code to remove gcc -Wparentheses warnings.
| | * | | | Changed code to remove gcc -Wparentheses warnings.ElectricSolstice2015-02-161-3/+5
| | |/ / /
| * | | | Merge pull request #1433 from cheece/patch-1Juan Linietsky2015-03-221-1/+53
| |\ \ \ \ | | | | | | | | | | | | COLLADA load morph target normals
| | * | | | COLLADA load normals from morph targetcheece2015-02-241-1/+53
| | | |_|/ | | |/| | | | | | | if the file has normals use them!
| * | | | Merge pull request #1460 from MarianoGnu/masterJuan Linietsky2015-03-223-0/+22
| |\ \ \ \ | | | | | | | | | | | | Create Checkbox class with support for Radio Buttons
| | * | | | Register CheckBox class to create it using editor.Mariano Javier Suligoy2015-03-022-0/+22
| | | | | |
| | * | | | Add CheckBox control with theme edition and radio icon avaible.Mariano Javier Suligoy2015-03-011-0/+0
| | |/ / /
| * | | | Merge pull request #1535 from rollenrolm/hidden_filesJuan Linietsky2015-03-222-5/+18
| |\ \ \ \ | | | | | | | | | | | | New option to show/hide hidden files
| | * | | | New option to show/hide hidden filesrollenrolm2015-03-212-5/+18
| | | | | |
| * | | | | Merge pull request #1537 from rollenrolm/issue_#931Juan Linietsky2015-03-222-13/+58
| |\ \ \ \ \ | | | | | | | | | | | | | | Fix issue #931: display current view name into editor's 3d scene viewpor...
| | * | | | | Fix issue #931: display current view name into editor's 3d scene viewportsrollenrolm2015-03-212-13/+58
| | |/ / / /
| * / / / / Fix for Issue #1484: Don't strip whitespace on line commentrollenrolm2015-03-221-2/+2
| |/ / / /
| * | | | signed distance field font supportJuan Linietsky2015-03-211-6/+6
| | | | |
| * | | | wip distance field font importJuan Linietsky2015-03-201-50/+297
| | | | | | | | | | | | | | | | | | | | font import may not work if using distance field, this is WIP
| * | | | Area2D can now detect overlap with other areasJuan Linietsky2015-03-171-1/+10
| | | | | | | | | | | | | | | | | | | | this should make everything simpler, specially for newcomers to Godot
| * | | | New option to send canvas to render bufferJuan Linietsky2015-03-162-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | allows to use 3D environment effects for post processing such as Glow, Bloom, HDR, etc. in 2D.
| * | | | back buffer copy node, to improve on texscreen()Juan Linietsky2015-03-121-0/+0
| | | | | | | | | | | | | | | | | | | | back buffer copy node and respective demo
| * | | | increase minimum range in property editor a bitJuan Linietsky2015-03-101-1/+1
| | | | |
| * | | | New Demo, Screen Space ShadersJuan Linietsky2015-03-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | -Fixes to screen space shaders. -Fixes to isometric light demo.
| * | | | lot of work on 2D lighting and isometric mapsJuan Linietsky2015-03-099-96/+233
| | | | | | | | | | | | | | | | | | | | | | | | | added a new demo, isometric_light that does full isometric sorting, lights, shadows, etc.
| * | | | Merge branch 'master' of https://github.com/okamstudio/godotJuan Linietsky2015-03-0334-58/+2480
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: modules/gdscript/gd_tokenizer.cpp scene/resources/shader_graph.h
| | * | | | support for 2D shadow castersJuan Linietsky2015-03-029-3/+627
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added support for 2D shadow casters. *DANGER* Shaders in CanvasItem CHANGED, if you are using shader in a CanvasItem and pull this, you will lose them. Shaders now work through a 2D material system similar to 3D. If you don't want to lose the 2D shader code, save the shader as a .shd, then create a material in CanvasItem and re-assign the shader.
| * | | | merges from okam repoJuan Linietsky2015-03-033-7/+37
| | | | |
* | | | | Merge branch 'master' of https://github.com/okamstudio/godot into snapping2Carl Olsson2015-02-229-23/+138
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #1369 from not-surt/tile_rotationJuan Linietsky2015-02-217-22/+137
| |\ \ \ \ | | | | | | | | | | | | Tile Rotation
| | * \ \ \ Merge branch 'master' of https://github.com/okamstudio/godotCarl Olsson2015-02-157-6/+659
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: scene/2d/tile_map.cpp
| | * | | | | Reorder tile transforms so transpose occurs before flips. Much more ↵Carl Olsson2015-02-132-14/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | intuitive for flipping transposed tiles.
| | * | | | | Moved wrapper function to TileMapEditor.Carl Olsson2015-02-112-5/+12
| | | | | | |
| | * | | | | Merge branch 'master' of https://github.com/okamstudio/godotCarl Olsson2015-02-117-13/+123
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/2d/polygon_path_finder_demo/.fscache
| | * | | | | | Revert variant arg length to 5 and add 5 arg wrapper function for TileMap ↵Carl Olsson2015-02-111-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | set_cell.
| | * | | | | | Forgot to update tile transform buttons when picking tiles.Carl Olsson2015-02-032-4/+6
| | | | | | | |
| | * | | | | | Finish GUI for tile transform.Carl Olsson2015-02-021-1/+43
| | | | | | | |