| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | | | Merge pull request #1580 from ↵ | Juan Linietsky | 2015-04-07 | 1 | -1/+3 | |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | UsernameIsAReservedWord/fixes_help_background_color_theme fixes #332 : makes EditorHelp uses EditorSettings bg color | |||||
| | * | | | | | makes_editorhelp_uses_editor_settings_bg_color | yg2f | 2015-03-26 | 1 | -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_FixCrashInVisualShader | Juan Linietsky | 2015-04-07 | 1 | -1/+1 | |
| |\ \ \ \ \ | | | | | | | | | | | | | (Fix crash) in visual shader for curve remap node | |||||
| | * | | | | | Fixed crash when trying to add keypoints and deleting them while holding ↵ | mostafahassan | 2015-03-31 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | mouse button down. | |||||
| * | | | | | | Merge pull request #1602 from TheHX/fix_issue_#1594 | Juan Linietsky | 2015-04-07 | 1 | -1/+4 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Fix Issue #1594 | |||||
| | * | | | | | | Better fix | Franklin Sobrinho | 2015-04-03 | 1 | -0/+5 | |
| | | | | | | | | ||||||
| | * | | | | | | fix_issue_#1594 | Franklin Sobrinho | 2015-04-02 | 1 | -2/+0 | |
| | | | | | | | | ||||||
| * | | | | | | | Added a PVRTC encoder for iOS | Juan Linietsky | 2015-04-06 | 1 | -1/+27 | |
| |/ / / / / / | ||||||
| * / / / / / | merging okam changes | Juan Linietsky | 2015-04-02 | 2 | -1/+38 | |
| |/ / / / / | ||||||
| * / / / / | New node will be added to root node if nothing is selected | mostafahassan | 2015-03-31 | 1 | -4/+5 | |
| |/ / / / | ||||||
| * | | | | crash bug solved, fixes #1560 | Juan Linietsky | 2015-03-23 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | android fixes, please test | Juan Linietsky | 2015-03-23 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | (can' t build android atm) | |||||
| * | | | | Merge branch 'master' of https://github.com/not-surt/godot into snapping2 | Carl Olsson | 2015-03-23 | 1 | -2/+2 | |
| |\| | | | ||||||
| | * | | | fixes to new window management API | Juan Linietsky | 2015-03-22 | 1 | -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 Olsson | 2015-03-23 | 2 | -13/+3 | |
| | | | | | | | | | | | | | | | | | canvas item snap function. | |||||
| * | | | | Merge branch 'master' of https://github.com/not-surt/godot into snapping2 | Carl Olsson | 2015-03-23 | 28 | -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_checkbox | Juan Linietsky | 2015-03-22 | 1 | -1/+1 | |
| | |\ \ \ | | | | | | | | | | | Make View > Settings a non check item | |||||
| | | * | | | View > Settings isn't a check item. | Felix Laurie von Massenbach | 2015-02-17 | 1 | -1/+1 | |
| | | | | | | ||||||
| | * | | | | Merge pull request #1380 from ElectricSolstice/wparentheses_removal | Juan Linietsky | 2015-03-22 | 1 | -3/+5 | |
| | |\ \ \ \ | | | | | | | | | | | | | Changed code to remove gcc -Wparentheses warnings. | |||||
| | | * | | | | Changed code to remove gcc -Wparentheses warnings. | ElectricSolstice | 2015-02-16 | 1 | -3/+5 | |
| | | |/ / / | ||||||
| | * | | | | Merge pull request #1433 from cheece/patch-1 | Juan Linietsky | 2015-03-22 | 1 | -1/+53 | |
| | |\ \ \ \ | | | | | | | | | | | | | COLLADA load morph target normals | |||||
| | | * | | | | COLLADA load normals from morph target | cheece | 2015-02-24 | 1 | -1/+53 | |
| | | | |_|/ | | |/| | | | | | | | if the file has normals use them! | |||||
| | * | | | | Merge pull request #1460 from MarianoGnu/master | Juan Linietsky | 2015-03-22 | 3 | -0/+22 | |
| | |\ \ \ \ | | | | | | | | | | | | | Create Checkbox class with support for Radio Buttons | |||||
| | | * | | | | Register CheckBox class to create it using editor. | Mariano Javier Suligoy | 2015-03-02 | 2 | -0/+22 | |
| | | | | | | | ||||||
| | | * | | | | Add CheckBox control with theme edition and radio icon avaible. | Mariano Javier Suligoy | 2015-03-01 | 1 | -0/+0 | |
| | | |/ / / | ||||||
| | * | | | | Merge pull request #1535 from rollenrolm/hidden_files | Juan Linietsky | 2015-03-22 | 2 | -5/+18 | |
| | |\ \ \ \ | | | | | | | | | | | | | New option to show/hide hidden files | |||||
| | | * | | | | New option to show/hide hidden files | rollenrolm | 2015-03-21 | 2 | -5/+18 | |
| | | | | | | | ||||||
| | * | | | | | Merge pull request #1537 from rollenrolm/issue_#931 | Juan Linietsky | 2015-03-22 | 2 | -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 viewports | rollenrolm | 2015-03-21 | 2 | -13/+58 | |
| | | |/ / / / | ||||||
| | * / / / / | Fix for Issue #1484: Don't strip whitespace on line comment | rollenrolm | 2015-03-22 | 1 | -2/+2 | |
| | |/ / / / | ||||||
| | * | | | | signed distance field font support | Juan Linietsky | 2015-03-21 | 1 | -6/+6 | |
| | | | | | | ||||||
| | * | | | | wip distance field font import | Juan Linietsky | 2015-03-20 | 1 | -50/+297 | |
| | | | | | | | | | | | | | | | | | | | | | font import may not work if using distance field, this is WIP | |||||
| | * | | | | Area2D can now detect overlap with other areas | Juan Linietsky | 2015-03-17 | 1 | -1/+10 | |
| | | | | | | | | | | | | | | | | | | | | | this should make everything simpler, specially for newcomers to Godot | |||||
| | * | | | | New option to send canvas to render buffer | Juan Linietsky | 2015-03-16 | 2 | -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 Linietsky | 2015-03-12 | 1 | -0/+0 | |
| | | | | | | | | | | | | | | | | | | | | | back buffer copy node and respective demo | |||||
| | * | | | | increase minimum range in property editor a bit | Juan Linietsky | 2015-03-10 | 1 | -1/+1 | |
| | | | | | | ||||||
| | * | | | | New Demo, Screen Space Shaders | Juan Linietsky | 2015-03-10 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | -Fixes to screen space shaders. -Fixes to isometric light demo. | |||||
| | * | | | | lot of work on 2D lighting and isometric maps | Juan Linietsky | 2015-03-09 | 9 | -96/+233 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | added a new demo, isometric_light that does full isometric sorting, lights, shadows, etc. | |||||
| | * | | | | Merge branch 'master' of https://github.com/okamstudio/godot | Juan Linietsky | 2015-03-03 | 34 | -58/+2480 | |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: modules/gdscript/gd_tokenizer.cpp scene/resources/shader_graph.h | |||||
| | | * | | | | support for 2D shadow casters | Juan Linietsky | 2015-03-02 | 9 | -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 repo | Juan Linietsky | 2015-03-03 | 3 | -7/+37 | |
| | | | | | | ||||||
| * | | | | | Merge branch 'master' of https://github.com/okamstudio/godot into snapping2 | Carl Olsson | 2015-02-22 | 9 | -23/+138 | |
| |\ \ \ \ \ | | |/ / / | |/| | | | ||||||
| | * | | | | Merge pull request #1369 from not-surt/tile_rotation | Juan Linietsky | 2015-02-21 | 7 | -22/+137 | |
| | |\ \ \ \ | | | | | | | | | | | | | Tile Rotation | |||||
| | | * \ \ \ | Merge branch 'master' of https://github.com/okamstudio/godot | Carl Olsson | 2015-02-15 | 7 | -6/+659 | |
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: scene/2d/tile_map.cpp | |||||
| | | * | | | | | Reorder tile transforms so transpose occurs before flips. Much more ↵ | Carl Olsson | 2015-02-13 | 2 | -14/+15 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | intuitive for flipping transposed tiles. | |||||
| | | * | | | | | Moved wrapper function to TileMapEditor. | Carl Olsson | 2015-02-11 | 2 | -5/+12 | |
| | | | | | | | | ||||||
| | | * | | | | | Merge branch 'master' of https://github.com/okamstudio/godot | Carl Olsson | 2015-02-11 | 7 | -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 Olsson | 2015-02-11 | 1 | -6/+6 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | set_cell. | |||||
| | | * | | | | | | Forgot to update tile transform buttons when picking tiles. | Carl Olsson | 2015-02-03 | 2 | -4/+6 | |
| | | | | | | | | | ||||||
| | | * | | | | | | Finish GUI for tile transform. | Carl Olsson | 2015-02-02 | 1 | -1/+43 | |
| | | | | | | | | | ||||||
