summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #37997 from reduz/local-rendering-devicesRémi Verschelde2020-04-197-74/+265
|\ | | | | Ability to create local RenderingDevice instances.
| * Ability to create local RenderingDevice instances.Juan Linietsky2020-04-187-74/+265
|/
* Merge pull request #37994 from akien-mga/mono-android-includeRémi Verschelde2020-04-181-1/+1
|\ | | | | Mono: Fix include for Android support
| * Mono: Fix include for Android supportRémi Verschelde2020-04-181-1/+1
|/ | | | | | This was a typo in #37153. Co-authored-by: Ignacio Etcheverry <ignalfonsore@gmail.com>
* Merge pull request #37963 from Calinou/doc-dynamicfont-limitationsRémi Verschelde2020-04-171-0/+1
|\ | | | | Document DynamicFont limitations and a possible workaround
| * Document DynamicFont limitations and a possible workaroundHugo Locurcio2020-04-171-0/+1
| | | | | | | | This closes #30014.
* | Merge pull request #37958 from akien-mga/scons-no-werror-on-stableRémi Verschelde2020-04-171-1/+3
|\ \ | | | | | | SCons: Disable -Werror on 'stable' releases
| * | SCons: Disable -Werror on 'stable' releasesRémi Verschelde2020-04-171-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | Stable releases are tagged and need to stay easy to compile in the future. As new compiler versions introduce new warnings or catch more occurrences, have -Werror set in tagged releases could be a bother. We still want it on by default for all Godot developers, so it's now conditional.
* | | Merge pull request #37949 from reduz/implement-global-shader-uniformsRémi Verschelde2020-04-1749-69/+3124
|\ \ \ | | | | | | | | Implement global and per instance shader uniforms.
| * | | Implement global and per instance shader uniforms.Juan Linietsky2020-04-1749-69/+3124
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds two keywords to shader language for uniforms: -'global' -'instance' This allows them to reference values outside the material.
* | | | Merge pull request #37953 from clayjohn/VULKAN-sky-sun-sizeRémi Verschelde2020-04-178-53/+44
|\ \ \ \ | | | | | | | | | | Add light size to Sky Shaders
| * | | | Add light size to Sky Shadersclayjohn2020-04-178-53/+44
| |/ / /
* | | | Merge pull request #37962 from Calinou/doc-image-size-limitsRémi Verschelde2020-04-172-0/+2
|\ \ \ \ | | | | | | | | | | Document image size limits
| * | | | Document image size limitsHugo Locurcio2020-04-172-0/+2
| | |_|/ | |/| | | | | | | | | | This closes #30238.
* | | | Merge pull request #37957 from Calinou/doc-angles-radiansRémi Verschelde2020-04-172-0/+2
|\ \ \ \ | | | | | | | | | | Clarify that angles must be specified as radians in the documentation
| * | | | Clarify that angles must be specified as radians in the documentationHugo Locurcio2020-04-172-0/+2
| | |_|/ | |/| | | | | | | | | | This closes #36356.
* | | | Merge pull request #37964 from AndreaCatania/AndreaCatania-patch-2Rémi Verschelde2020-04-171-2/+2
|\ \ \ \ | |_|/ / |/| | | Activate Physics Process in SpringArm3D.
| * | | Activate Physics Process in SpringArm3D.Andrea Catania2020-04-171-2/+2
| | | |
* | | | Merge pull request #37951 from clayjohn/VULKAN-sky-sourceRémi Verschelde2020-04-173-24/+29
|\ \ \ \ | |_|/ / |/| | | Use sky properly for ambient and reflections
| * | | Use sky properly for ambient and reflectionsclayjohn2020-04-163-24/+29
| | |/ | |/|
* | | i18n: Sync translations with WeblateRémi Verschelde2020-04-1763-3611/+4154
| | | | | | | | | | | | (cherry picked from commit 471a5abbf3651fc01e7c4f63c994164041d0c93f)
* | | Update AUTHORS and DONORS listRémi Verschelde2020-04-173-6/+38
| | | | | | | | | | | | | | | | | | | | | New contributors added to AUTHORS: @dreamsComeTrue, @kuruk-mm, @lawnjelly, @ThakeeNathees Thanks to all contributors and donors for making Godot possible!
* | | Merge pull request #35261 from YeldhamDev/load_pck_destinationRémi Verschelde2020-04-177-15/+55
|\ \ \ | |/ / |/| | Made possible to specify where to dump the contents when loading a ".pck" file
| * | Made possible to specify where to dump the contents when loading a ".pck" fileMichael Alexsander2020-04-167-15/+55
|/ /
* | Merge pull request #36868 from Calinou/improve-cli-script-error-messageRémi Verschelde2020-04-161-2/+2
|\ \ | | | | | | Tweak the error message when trying to run an invalid script from CLI
| * | Tweak the error message when trying to run an invalid script from CLIHugo Locurcio2020-03-061-2/+2
| | |
* | | Merge pull request #37012 from Calinou/reverse-builtin-script-namingRémi Verschelde2020-04-161-2/+4
|\ \ \ | | | | | | | | Tweak the built-in script naming for resources with custom names
| * | | Tweak the built-in script naming for resources with custom namesHugo Locurcio2020-03-131-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes the script name appear before the scene file name, which ensures it's always visible even if the list of scripts is too narrow to display the full name. This only impacts built-in scripts with custom resource names. Unnamed resources will still use `<scene_file>::<id>` naming in the list of scripts.
* | | | Merge pull request #37047 from YeldhamDev/tabcontainer_doc_control_fixRémi Verschelde2020-04-162-3/+3
|\ \ \ \ | | | | | | | | | | Fix incorrect TabContainer documentation for 'get_tab_control()'
| * | | | Fix incorrect TabContainer documentation for 'get_tab_control()'Michael Alexsander2020-03-143-5/+4
| | | | |
* | | | | Merge pull request #37747 from KoBeWi/cam2centerRémi Verschelde2020-04-161-1/+2
|\ \ \ \ \ | | | | | | | | | | | | Improve Camera2D documentation
| * | | | | Improve Camera2D documentationTomasz Chabora2020-04-101-1/+2
| | | | | |
* | | | | | Merge pull request #37856 from Calinou/doc-basebutton-keep-pressed-outsideRémi Verschelde2020-04-161-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Mention `keep_pressed_outside` caveat in the BaseButton documentation
| * | | | | | Mention `keep_pressed_outside` caveat in the BaseButton documentationHugo Locurcio2020-04-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This closes #37790.
* | | | | | | Merge pull request #37832 from Calinou/doc-improve-dictionaryRémi Verschelde2020-04-161-6/+16
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Improve the Dictionary class documentation
| * | | | | | | Improve the Dictionary class documentationHugo Locurcio2020-04-121-6/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This closes https://github.com/godotengine/godot-docs/issues/3376.
* | | | | | | | Merge pull request #37824 from nekomatata/rigid-body-force-docRémi Verschelde2020-04-161-2/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | More details in Rigid Body add_force documentation
| * | | | | | | | More details in Rigid Body add_force documentationPouleyKetchoupp2020-04-121-2/+3
| | | | | | | | |
* | | | | | | | | Merge pull request #37869 from madmiraal/fix-36533Rémi Verschelde2020-04-161-1/+5
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Assign zero to range when ConvexPolygonShape2D is empty.
| * | | | | | | | | Assign zero to range when ConvexPolygonShape2D is empty.Marcel Admiraal2020-04-141-1/+5
| | | | | | | | | |
* | | | | | | | | | Merge pull request #37921 from Calinou/doc-improve-audiostreamsampleRémi Verschelde2020-04-161-6/+6
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Improve the AudioStreamSample class documentation
| * | | | | | | | | | Improve the AudioStreamSample class documentationHugo Locurcio2020-04-151-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This closes #37915.
* | | | | | | | | | | Merge pull request #37895 from qarmin/more_leak_fixesRémi Verschelde2020-04-164-1/+21
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fixes leaks in ResourceCache, Vulkan and X11
| * | | | | | | | | | | Fixes leaks in ResourceCache, Vulkan and X11qarmin2020-04-154-1/+21
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #37926 from m4gr3d/migrate_legacy_apache_libRémi Verschelde2020-04-166-7/+8
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | Migrate legacy apache dependency to the GodotPayment plugin
| * | | | | | | | | | | Migrate legacy apache dependency to the GodotPayment pluginfhuya2020-04-156-7/+8
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the only location in the codebase where it's being used, so no need to make the main lib have a dependency on it.
* | | | | | | | | | | Merge pull request #37914 from clayjohn/VULKAN-decal-fixRémi Verschelde2020-04-153-16/+13
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix texture check in decal setup
| * | | | | | | | | | | Fix texture check in decal setupclayjohn2020-04-153-16/+13
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #37911 from madmiraal/fix-32876Rémi Verschelde2020-04-151-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Run SpringArm3D's process within physics.
| * | | | | | | | | | | | Run SpringArm3D's process within physics.Marcel Admiraal2020-04-151-1/+1
| |/ / / / / / / / / / /