summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #41971 from nekomatata/richtextlabel-align-pointerRémi Verschelde2020-09-111-1/+1
|\ | | | | Fix RichTextLabel alignment for clickable regions
| * Fix RichTextLabel alignment for clickable regionsPouleyKetchoupp2020-09-111-1/+1
| | | | | | | | | | | | | | | | Fixes #41006 (regression from #39164). The original alignment fix was limited to PROCESS_DRAW mode, which caused some discrepancies with PROCESS_POINTER mode. Now only PROCESS_CACHE is excluded with a condition a few lines above.
* | Merge pull request #40973 from Paulb23/code_editRémi Verschelde2020-09-1025-972/+1512
|\ \ | | | | | | Add CodeEdit and TextEdit gutter system
| * | Remove breakpoints from editor settingsPaulb232020-09-104-23/+6
| | |
| * | Move safe line color into editorPaulb232020-09-106-30/+31
| | |
| * | Move ConnectionGutter to editor code_editorPaulb232020-09-105-150/+67
| | |
| * | Add folding gutter to code_editPaulb232020-09-106-127/+103
| | |
| * | Add main_gutter (breakpoints, bookmarks, execution lines) to code_editPaulb232020-09-1019-376/+402
| | |
| * | Changed line_edited_from(from) to lines_edit_from(from, to)Paulb232020-09-106-14/+11
| | |
| * | Added Line numbers to CodeEditPaulb232020-09-108-135/+173
| | |
| * | Added gutter system to TextEditPaulb232020-09-102-24/+473
| | |
| * | Add and convert editor to use CodeEditPaulb232020-09-1012-247/+400
|/ /
* | Merge pull request #41957 from skyace65/SpriteFramesRémi Verschelde2020-09-101-1/+1
|\ \ | | | | | | Improve SpriteFrames get_animation_loop description
| * | Improve SpriteFrames get_animation_loop descriptionskyace652020-09-101-1/+1
| | |
* | | Merge pull request #41954 from Calinou/raycast-rename-cast-toRémi Verschelde2020-09-107-35/+35
|\ \ \ | | | | | | | | Rename RayCast's `cast_to` property to `target_position`
| * | | Rename RayCast's `cast_to` property to `target_position`Hugo Locurcio2020-09-107-35/+35
| | | | | | | | | | | | | | | | | | | | `cast_to` is sometimes mistaken as a method rather than a property. `target_position` makes it more obvious that it's a property.
* | | | Merge pull request #41806 from AndreaCatania/AndreaCatania-patch-4Rémi Verschelde2020-09-101-1/+1
|\ \ \ \ | | | | | | | | | | Avoid adding margin twice along capsule Y axis
| * | | | Avoid adding margin twice along capsule Y axisAndrea Catania2020-09-061-1/+1
| | | | |
* | | | | Merge pull request #41951 from Yetizone/update_header_guardRémi Verschelde2020-09-101-3/+3
|\ \ \ \ \ | |_|_|/ / |/| | | | scene_tree.h: Update header guard
| * | | | scene_tree.h: Update header guardYetizone2020-09-101-3/+3
|/ / / /
* | | | Merge pull request #41945 from capnm/upstream-prsRémi Verschelde2020-09-101-0/+3
|\ \ \ \ | | | | | | | | | | git: Ignore clangd cache folder
| * | | | git: Ignore clangd cache folderMartin Capitanio2020-09-101-0/+3
| | | | |
* | | | | Merge pull request #41944 from madmiraal/remove-unused-importsRémi Verschelde2020-09-107-9/+0
|\ \ \ \ \ | |/ / / / |/| | | | Remove unused Python imports.
| * | | | Remove unused Python imports.Marcel Admiraal2020-09-107-9/+0
| | |_|/ | |/| |
* | | | Merge pull request #41795 from Hassan-A/tilemap-rotate-fixRémi Verschelde2020-09-101-3/+2
|\ \ \ \ | | | | | | | | | | Fix tilemap tile preview on horizontal/vertical flips.
| * | | | Fix tilemap tiles on horizontal/vertical flipsHaz2020-09-061-3/+2
| | | | |
* | | | | Merge pull request #41890 from YeldhamDev/tabs_previousRémi Verschelde2020-09-103-0/+18
|\ \ \ \ \ | | | | | | | | | | | | Add 'get_previous_tab()' to 'Tabs'
| * | | | | Add 'get_previous_tab()' to 'Tabs'Michael Alexsander2020-09-083-0/+18
| | | | | |
* | | | | | Merge pull request #41935 from Chaosus/vs_texture3dRémi Verschelde2020-09-108-3/+264
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Added Texture3D to visual shaders
| * | | | | Added Texture3D to visual shadersYuri Roubinsky2020-09-108-3/+264
| | | | | |
* | | | | | Merge pull request #41940 from madmiraal/remove-duplicate-definitionsRémi Verschelde2020-09-102-7/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove duplicate or unnecessary Python definitions.
| * | | | | | Remove duplicate or unnecessary Python definitions.Marcel Admiraal2020-09-102-7/+0
| | | | | | |
* | | | | | | Merge pull request #41920 from Chaosus/fix_colorpickerRémi Verschelde2020-09-101-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix ColorPickerButton to apply changes after picker popup closed
| * | | | | | | Fix ColorPickerButton to apply changes after picker popup closedYuri Roubinsky2020-09-091-2/+2
| | | | | | | |
* | | | | | | | Merge pull request #41937 from madmiraal/remove-unused-variableRémi Verschelde2020-09-101-1/+0
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | Remove unused variable in fixed-size.html.
| * | | | | | | Remove unused variable in fixed-size.html.Marcel Admiraal2020-09-101-1/+0
|/ / / / / / /
* | | | | | | Merge pull request #41928 from akien-mga/tinyexr-1.0.0Rémi Verschelde2020-09-104-251/+469
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | tinyexr: Sync with upstream 1.0.0
| * | | | | | | tinyexr: Sync with upstream 1.0.0Rémi Verschelde2020-09-094-251/+469
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge pull request #41932 from clayjohn/VULKAN-3dtexture-repeatRémi Verschelde2020-09-101-0/+3
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | Set repeat in all 3 dimensions in 3d textures
| * | | | | | Set repeat in all 3 dimensions in 3d texturesclayjohn2020-09-091-0/+3
|/ / / / / /
* | | | | | Merge pull request #41926 from Calinou/rename-shortcut-sentence-caseRémi Verschelde2020-09-0917-98/+99
|\ \ \ \ \ \ | | | | | | | | | | | | | | Rename ShortCut to Shortcut which is more grammatically correct
| * | | | | | Rename ShortCut to Shortcut which is more grammatically correctHugo Locurcio2020-09-0917-98/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://github.com/godotengine/godot/issues/16863#issuecomment-685236980.
* | | | | | | Merge pull request #41925 from reduz/improve-exr-loadingJuan Linietsky2020-09-091-53/+105
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Make EXR import format support all depths and channel configurations
| * | | | | | Make EXR import format support all depths and channel configurationsreduz2020-09-091-53/+105
|/ / / / / /
* | | | | | Merge pull request #41922 from Chaosus/fix_build_warningRémi Verschelde2020-09-091-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Fix build warning in visual_shader_editor
| * | | | | Fix build warning in visual_shader_editorYuri Roubinsky2020-09-091-1/+1
| | | | | |
* | | | | | Merge pull request #41921 from akien-mga/stb_vorbis-increase-max-allocRémi Verschelde2020-09-091-2/+6
|\ \ \ \ \ \ | |/ / / / / |/| | | | | stb_vorbis: Increase max alloc buffer size for big Vorbis comments
| * | | | | stb_vorbis: Increase max alloc buffer size for big Vorbis commentsRémi Verschelde2020-09-091-2/+6
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous max worked OK for audio data, but stb_vorbis recently gained support for Vorbis comments, which can embed up to 2^32-1 bytes of data (e.g. cover art encoded as base64). We use 2^30 as max which should be sufficient for most files. Fixes #41913.
* | | | | Merge pull request #41918 from reduz/implement-3d-texturesJuan Linietsky2020-09-0916-39/+1173
|\ \ \ \ \ | |/ / / / |/| | | | Implement 3D textures as import and resource format.
| * | | | Implement 3D textures as import and resource format.reduz2020-09-0916-39/+1173
| | | | |