aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | | | mono: Plane, expose Normal, and DKelly Thomas2018-05-171-38/+44
| | |/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | -Hid texture flags by default so they dont take so much spaceJuan Linietsky2018-05-182-2/+4
| |_|_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -make curve texture preview not so large, so its easier to embed the editor
* | | | | | | | | | | | | | | | | | Merge pull request #19004 from BastiaanOlij/fix_particles_viewport_textureJuan Linietsky2018-05-181-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes issue that a viewport texture doesn't work with particle shader
| * | | | | | | | | | | | | | | | | | Fixes issue that a viewport texture doesn't work with particle shaderBastiaan Olij2018-05-181-0/+3
| | |_|_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge pull request #18978 from Chaosus/cubebugfixRémi Verschelde2018-05-181-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix property bug in CubeMesh which prevent it from changing in inspector
| * | | | | | | | | | | | | | | | | | Fix bug in CubeMeshChaosus2018-05-171-1/+1
| | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge pull request #18989 from YeldhamDev/filter_fancyRémi Verschelde2018-05-182-9/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | Small visual changes for some filter bars
| * | | | | | | | | | | | | | | | | Small visual changes for some filter bars.Michael Alexsander Silva Dias2018-05-172-9/+5
|/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge pull request #18988 from godotengine/revert-18981-fix_color_pickerRémi Verschelde2018-05-181-4/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Fix color-picker sliders"
| * | | | | | | | | | | | | | | | | Revert "Fix color-picker sliders"Rémi Verschelde2018-05-181-4/+5
|/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge pull request #18960 from isaacremnant/autotile_3x3_minimalMariano Javier Suligoy2018-05-174-17/+34
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restore support for minimal 3x3 autotile sets
| * | | | | | | | | | | | | | | | | Restore support for minimal 3x3 autotile setsisaacremnant2018-05-174-17/+34
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Working Drag & Drop again in inspectorJuan Linietsky2018-05-173-1/+123
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge pull request #18981 from capnm/fix_color_pickerRémi Verschelde2018-05-181-5/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix color-picker sliders
| * | | | | | | | | | | | | | | | | | Fix color-picker slidersMartin Capitanio2018-05-171-5/+4
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge pull request #18962 from djrm/pr_inspector_dockRémi Verschelde2018-05-186-634/+748
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | Moved inspector functionality from EditorNode to InspectorDock.
| * | | | | | | | | | | | | | | | | | Moved inspector functionality from EditorNode to InspectorDock.Daniel J. Ramirez2018-05-176-634/+748
|/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | -Ability to open resources in the same windowJuan Linietsky2018-05-1726-302/+579
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -Plenty of fixes and improvements to new inspector -Fixes that were needed to make inspector work better
* | | | | | | | | | | | | | | | | | Merge pull request #18971 from marcelofg55/missing_returnJuan Linietsky2018-05-171-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | Fix missing return on Navigation2D::get_closest_point_owner
| * | | | | | | | | | | | | | | | | Fix missing return on Navigation2D::get_closest_point_ownerMarcelo Fernandez2018-05-171-1/+1
|/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge pull request #18967 from Valentactive/fix-mono-build-linuxRémi Verschelde2018-05-171-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes build error on Linux after its introduction in #18949
| * | | | | | | | | | | | | | | | | fixes build error on Linux after its introduction in #18949Michele Valente2018-05-171-2/+2
|/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The function expects now a return value. Returning NULL seems to work in this case.
* | | | | | | | | | | | | | | | | Merge pull request #18405 from flashyincceo/gdscript-constants-helpRémi Verschelde2018-05-171-0/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Ctrl+click on @GDScript constants
| * | | | | | | | | | | | | | | | | Fix Ctrl+click on @GDScript constantsPeter Folkins2018-04-241-0/+7
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge pull request #18529 from swarnimarun/masterRémi Verschelde2018-05-171-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix StaticBody2D ignore in tileset bug
| * | | | | | | | | | | | | | | | | | Fix tileset bug #18090 to use StaticBody2D positionSwarnim Arun2018-05-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using staticbody2d position to affect the collision shape position whenever a tileset is created. Formatting the code Removed the most get/set from my old code.
* | | | | | | | | | | | | | | | | | | Merge pull request #18862 from endragor/remove-font-width-ceilingRémi Verschelde2018-05-172-7/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ceil char width within Label instead of Font
| * | | | | | | | | | | | | | | | | | | Ceil char width within Label instead of FontRuslan Mustakov2018-05-142-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some classes use Font::get_char_size directly and not only for autowrapping. RichTextLabel is one such example. So this commit reverts aa8561d (PR #17504) and instead ceils character width within Label. This makes sure Label autowraps correctly while not affecting other Font clients. Fixes #18835.
* | | | | | | | | | | | | | | | | | | | Merge pull request #18949 from neikeq/aloRémi Verschelde2018-05-175-66/+146
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mono: Project building fixes
| * | | | | | | | | | | | | | | | | | | | Mono: Project building fixesIgnacio Etcheverry2018-05-175-66/+146
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Set (Csc/Vbc/Fsc)ToolExe environment variables to point to the batch files in Mono's bin directory when building with Mono's MSBuild. - Set Mono's MSBuild as the default build tool on Windows. - Generate projects with portable DebugType instead of full.
* | | | | | | | | | | | | | | | | | | | | Merge pull request #18946 from nemerle/fix_poolallocator_resizeRémi Verschelde2018-05-171-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | Fix PoolAllocator::resize for too large p_new_size
| * | | | | | | | | | | | | | | | | | | | Fix PoolAllocator::resize for too large p_new_sizenemerle2018-05-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code had a subtle signed/unsigned bug - ```cpp if( signed - unsigned < 0) // signed - unsigned is unsigned in c++, so if( unsigned < 0) // and thus the if block will never be executed ``` Thus all the following code would be ran, including unnecessary retries of compacting the pool.
* | | | | | | | | | | | | | | | | | | | | Merge pull request #15909 from authenticate/tilemap_fixMariano Javier Suligoy2018-05-161-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | TileMap Navigation Fixes
| * | | | | | | | | | | | | | | | | | | | Fixing a bug where tilemap navigation would not be accurate after a tilemap ↵James2018-05-151-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | exits and then re-enters the tree. Fixing a bug where deleting a tile and then querying navigation would result in an incorrect path if both happened within the same frame.
* | | | | | | | | | | | | | | | | | | | | Merge pull request #18889 from madadam/async-await-fixIgnacio Etcheverry2018-05-161-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set current SynchronizationContext before the game loop starts
| * | | | | | | | | | | | | | | | | | | | | Set current SynchronizationContext before the game loop startsAdam Cigánek2018-05-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes the problem that `SynchronizationContext.Current` would be null during the call to `_EnterTree`, `_Ready` and the first call to `_Process` thus the task continuations would be scheduled outside the main thread, which is unexpected and might lead to crashes. With this change, task continuations are scheduled always on the main thread and so async/await can be used without any explicit synchronization, which is what is expected. Fixes #18849
* | | | | | | | | | | | | | | | | | | | | | Added Rename Context Menu Option for SceneTreeDockEoin O'Neill2018-05-162-1/+14
| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge pull request #18804 from tagcup/vec_slerpRémi Verschelde2018-05-1611-17/+158
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add SLERP to Vector{2,3}, optimize Quat's Vector3 rotation.
| * | | | | | | | | | | | | | | | | | | | | | Add SLERP to Vector{2,3}, optimize Quat's Vector3 rotation.tagcup2018-05-1211-17/+158
| |/ / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also even out Basis and Quat APIs a little.
* | | | | | | | | | | | | | | | | | | | | | Merge pull request #18814 from PJB3005/18-05-12-imagetexture-load-errorRémi Verschelde2018-05-164-6/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ImageTexture.load returns an error code.
| * | | | | | | | | | | | | | | | | | | | | | ImageTexture.load returns an error code.Pieter-Jan Briers2018-05-144-6/+11
| |/ / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | Merge pull request #18868 from bruvzg/clang_6_workaroundRémi Verschelde2018-05-161-9/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Workaround for clang 6.0.0 / Xcode 9.3 release (-O3) build bug.
| * | | | | | | | | | | | | | | | | | | | | | Workaround for clang 6 bug.bruvzg2018-05-141-9/+9
| | |_|_|/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge pull request #18930 from samdze/masterRémi Verschelde2018-05-161-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed the name displayed for built-in scripts in the Script tab with a more descriptive one
| * | | | | | | | | | | | | | | | | | | | | | Changed the name displayed in the Script tab for built-in script with a more ↵Samuele Zolfanelli2018-05-161-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | descriptive one
* | | | | | | | | | | | | | | | | | | | | | | Merge pull request #18934 from YeldhamDev/project_metadata_exposeRémi Verschelde2018-05-164-4/+29
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Exposed set/get_project_metadata in EditorSettings
| * | | | | | | | | | | | | | | | | | | | | | | Exposed set/get_project_metadata in EditorSettings.Michael Alexsander Silva Dias2018-05-164-4/+29
| | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #18944 from akien-mga/appveyor-pipRémi Verschelde2018-05-161-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix scons installation on AppVeyor
| * | | | | | | | | | | | | | | | | | | | | | | | Fix scons installation on AppVeyorRémi Verschelde2018-05-161-1/+2
|/ / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Seems like AppVeyor just upgraded pip and finally removed the deprecated --egg switch.
* | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #18905 from volzhs/zstd-1.3.4Rémi Verschelde2018-05-1632-3196/+5587
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update zstd to 1.3.4