summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-12-18bullet: Sync with upstream 3.07Rémi Verschelde
2020-12-18Merge pull request #44457 from akien-mga/scons-thirdparty-lib-dependsRémi Verschelde
SCons: Add explicit dependencies on thirdparty code in cloned env
2020-12-18Merge pull request #44490 from madmiraal/add-override-keywordsRémi Verschelde
Add missing override keywords in os_windows.h
2020-12-18Merge pull request #44486 from Chaosus/search_help_enchanceRémi Verschelde
Show only one constructor for each type in Search Help panel
2020-12-18Add missing override keywords in os_windows.hMarcel Admiraal
2020-12-18SCons: Add explicit dependencies on thirdparty code in cloned envRémi Verschelde
Since we clone the environments to build thirdparty code, we don't get an explicit dependency on the build objects produced by that environment. So when we update thirdparty code, Godot code using it is not necessarily rebuilt (I think it is for changed headers, but not for changed .c/.cpp files), which can lead to an invalid compilation output (linking old Godot .o files with a newer, potentially ABI breaking version of thirdparty code). This was only seen as really problematic with bullet updates (leading to crashes when rebuilding Godot after a bullet update without cleaning .o files), but it's safer to fix it everywhere, even if it's a LOT of hacky boilerplate.
2020-12-18Show constructor arguments in Search Help panel (for basic types)Yuri Roubinsky
2020-12-17Merge pull request #44467 from madmiraal/add-override-keywordsRémi Verschelde
Add missing override keywords to core/os.h derived classes
2020-12-17Merge pull request #44469 from pycbouh/graph-minimap-improvementsRémi Verschelde
Fix visual issues with GraphEdit minimap
2020-12-17FIx visual issues with GraphEdit minimapYuri Sizov
2020-12-17Add override keywords to core/os.h derived classes.Marcel Admiraal
2020-12-17Merge pull request #44463 from madmiraal/remove-os-can_drawRémi Verschelde
Remove OS::can_draw() remnants
2020-12-17Remove OS::can_draw() remnantsMarcel Admiraal
2020-12-17Merge pull request #43416 from pycbouh/graph-minimapRémi Verschelde
Add a minimap to the GraphEdit
2020-12-17Merge pull request #37759 from pycbouh/remove-arg-from-get_type_listRémi Verschelde
Remove unused argument in Theme method and expose missing methods
2020-12-17Remove unused argument in Theme method and expose missing methodsYuri Sizov
2020-12-17Merge pull request #44452 from RandomShaper/fix_crash_parsing_refRémi Verschelde
Fix crash parsing a serialized Reference
2020-12-17Merge pull request #44449 from akien-mga/scons-fix-platform-logicRémi Verschelde
SCons: Fix build with `p` alias or platform auto-detection
2020-12-17Fix crash parsing a serialized ReferencePedro J. Estébanez
2020-12-17SCons: Fix build with `p` alias or platform auto-detectionRémi Verschelde
Fixes a pre-existing bug that #44433 exposed. It's pretty hacky, but we use `platform` in `env` both as an optional command line option (instead it can be autodetected, or passed via the `p` alias, and on Linux it might be overridden if you pass one of the convenience alias values), and as the reference value for what platform we're building on. Thus we override `env_base["platform"]` with the autodetected or validated platform, but any call to `opts.Update(env_base)` overrides it with the original command line option... causing e.g. #44448. The proper fix would be to refactor all this so that we don't reuse `env["platform"]` for platform detection (it could instead be e.g. `env.platform` as a member variable which holds the validated value), but for now I'm tapering over the immediate breakage. Fixes #44448 and other breakages induced by #44433.
2020-12-17Merge pull request #44393 from Calinou/add-stdout-flush-project-settingRémi Verschelde
Add a project setting to enable stdout flushing in release builds
2020-12-17Merge pull request #44295 from akien-mga/proximity-group-fix-access-modifiersRémi Verschelde
ProximityGroup: Fix access modifiers, rename private methods for clarity
2020-12-17Merge pull request #44301 from pycbouh/show-count-find-in-filesRémi Verschelde
Display the number of results for global search
2020-12-17Merge pull request #44105 from neikeq/mono-wasm-m2n-hookRémi Verschelde
Mono: Make Godot provide its own WASM m2n trampolines
2020-12-17Merge pull request #44374 from neikeq/mono-wasm-extra-framework-asmsRémi Verschelde
Mono: Add extra WASM framework assemblies on game export
2020-12-17Merge pull request #44433 from akien-mga/scons-fix-platform-optsRémi Verschelde
SCons: Add only selected platform's opts to env
2020-12-17Merge pull request #44360 from bruvzg/ctl_punct_word_breakRémi Verschelde
Add word breaks on punctuation characters.
2020-12-17Merge pull request #42872 from dreamsComeTrue/better-camera2d-zoomRémi Verschelde
Fix camera2d zoom when set to zero (affine_invert: Condition ' det == 0 ' is true)
2020-12-16Fix camera2d zoom when set to zero (causing ERROR: affine_invert: Condition ↵Dominik 'dreamsComeTrue' Jasiński
' det == 0 ' is true.) Fixes: #41873
2020-12-16Merge pull request #44410 from KoBeWi/project--tools--thisPRRémi Verschelde
Make tool menu plugins use Callables for callback
2020-12-16Merge pull request #44430 from reduz/reimplement-skeletons-blendshapesJuan Linietsky
Reimplement skeletons and blend shapes
2020-12-16Make tool menu plugins use Callables for callbackkobewi
2020-12-16Reimplement skeletons and blend shapesreduz
Uses compute shaders, which only once, on demand, and all in parallel.
2020-12-16SCons: Add only selected platform's opts to envRémi Verschelde
Otherwise we can get situations where platform-specific opts with the same name can override each other depending on the order at which platforms are parsed, as was the case with `use_static_cpp` in Linux/Windows. Fixes #44304. This also has the added benefit that the `scons --help` output will now only include the options which are relevant for the selected (or detected) platform.
2020-12-16Merge pull request #44429 from mbrlabs/rot-gizmo-handleRémi Verschelde
Changed the rotation gizmo handle to use the active axis color
2020-12-16Merge pull request #44424 from briansemrau/gdscript-fix-andRémi Verschelde
Fix gdscript `and` operator
2020-12-16Changed the rotation gizmo handle to use the active axis colorMarcus Brummer
2020-12-16Merge pull request #44341 from Faless/docs/4.x_os_unixtimeRémi Verschelde
Add important note about OS.get_unixtime.
2020-12-16Merge pull request #44366 from ↵Rémi Verschelde
gongpha/fix-texture3d-texturearray-icon-rasterizing Improve Texture3D and TextureArray icons
2020-12-16Merge pull request #44404 from Chaosus/doc_direction_toRémi Verschelde
Added a note describing a code behind Vector2/3.direction_to
2020-12-16Merge pull request #44414 from skyace65/TypeHintRémi Verschelde
Document what can be used as a type hint
2020-12-16Merge pull request #44412 from DanielZTing/renameRémi Verschelde
Rename neighbour in Control to neighbor
2020-12-16Merge pull request #44423 from naithar/fix/text-edit-cursorRémi Verschelde
[4.0] TextEdit virtual keyboard cursor fix
2020-12-16Merge pull request #44419 from winterpixelgames/PR-dissasemlber-fix-num-2Rémi Verschelde
fixes crash in disassembler for opcode OPCODE_ASSIGN_TYPED_NATIVE
2020-12-16Fix gdscript and operatorBrian Semrau
2020-12-16Merge pull request #44421 from madmiraal/fix-non-c-typedef-for-linkageRémi Verschelde
Fix named anonymous struct warning
2020-12-16Fix named anonymous struct warningMarcel Admiraal
2020-12-15fixes crash in disassemlber for opcode OPCODE_ASSIGN_TYPED_NATIVEJordan Schidlowsky
2020-12-16GUI: use cursor in TextEdit for non selected text.Sergey Minakov
2020-12-15Document what can be used as a type hintskyace65