maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
31896 commits 10 branches 35 tags 1.1 GiB
Commit graph

31896 commits

This branch
This branch
All branches
Author SHA1 Message Date
Rémi Verschelde 3cbf8bde84
bullet: Sync with upstream 3.07 2020-12-18 13:41:11 +01:00
Rémi Verschelde 214a22b98e
Merge pull request #44457 from akien-mga/scons-thirdparty-lib-depends 
SCons: Add explicit dependencies on thirdparty code in cloned env
 2020-12-18 13:40:33 +01:00
Rémi Verschelde 126d88bce4
Merge pull request #44490 from madmiraal/add-override-keywords 
Add missing override keywords in os_windows.h
 2020-12-18 12:11:49 +01:00
Rémi Verschelde 94bbcac945
Merge pull request #44486 from Chaosus/search_help_enchance 
Show only one constructor for each type in Search Help panel
 2020-12-18 11:42:23 +01:00
Marcel Admiraal b56a2f34ce Add missing override keywords in os_windows.h 2020-12-18 09:38:09 +00:00
Rémi Verschelde c7b53c03ae
SCons: Add explicit dependencies on thirdparty code in cloned env 
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-18 10:29:34 +01:00
Yuri Roubinsky 89ed0323b9 Show constructor arguments in Search Help panel (for basic types) 2020-12-18 12:21:41 +03:00
Rémi Verschelde 5332d212f9
Merge pull request #44467 from madmiraal/add-override-keywords 
Add missing override keywords to core/os.h derived classes
 2020-12-17 23:02:58 +01:00
Rémi Verschelde 170a429acb
Merge pull request #44469 from pycbouh/graph-minimap-improvements 
Fix visual issues with GraphEdit minimap
 2020-12-17 22:59:56 +01:00
Yuri Sizov f5bcbd8325 FIx visual issues with GraphEdit minimap 2020-12-17 22:59:04 +03:00
Marcel Admiraal fa435a550a Add override keywords to core/os.h derived classes. 2020-12-17 18:02:31 +00:00
Rémi Verschelde 2c0d1c3b91
Merge pull request #44463 from madmiraal/remove-os-can_draw 
Remove OS::can_draw() remnants
 2020-12-17 18:52:58 +01:00
Marcel Admiraal 60ddca2545 Remove OS::can_draw() remnants 2020-12-17 16:35:48 +00:00
Rémi Verschelde c83d1b2526
Merge pull request #43416 from pycbouh/graph-minimap 
Add a minimap to the GraphEdit
 2020-12-17 17:34:36 +01:00
Rémi Verschelde 68117f5e75
Merge pull request #37759 from pycbouh/remove-arg-from-get_type_list 
Remove unused argument in Theme method and expose missing methods
 2020-12-17 14:31:04 +01:00
Yuri Sizov 8d608cdc40 Remove unused argument in Theme method and expose missing methods 2020-12-17 15:51:08 +03:00
Rémi Verschelde f47ef030d0
Merge pull request #44452 from RandomShaper/fix_crash_parsing_ref 
Fix crash parsing a serialized Reference
 2020-12-17 13:15:08 +01:00
Rémi Verschelde e61f5867e8
Merge pull request #44449 from akien-mga/scons-fix-platform-logic 
SCons: Fix build with `p` alias or platform auto-detection
 2020-12-17 13:14:51 +01:00
Pedro J. Estébanez 1b745c7bae Fix crash parsing a serialized Reference 2020-12-17 12:24:57 +01:00
Rémi Verschelde 8f660393fe
SCons: Fix build with p alias or platform auto-detection 
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-17 11:36:50 +01:00
Rémi Verschelde f3dccf5891
Merge pull request #44393 from Calinou/add-stdout-flush-project-setting 
Add a project setting to enable stdout flushing in release builds
 2020-12-17 10:06:50 +01:00
Rémi Verschelde aa64834f72
Merge pull request #44295 from akien-mga/proximity-group-fix-access-modifiers 
ProximityGroup: Fix access modifiers, rename private methods for clarity
 2020-12-17 10:06:02 +01:00
Rémi Verschelde e2c0082b6a
Merge pull request #44301 from pycbouh/show-count-find-in-files 
Display the number of results for global search
 2020-12-17 10:04:50 +01:00
Rémi Verschelde b07a3f503b
Merge pull request #44105 from neikeq/mono-wasm-m2n-hook 
Mono: Make Godot provide its own WASM m2n trampolines
 2020-12-17 09:58:24 +01:00
Rémi Verschelde f6820306e0
Merge pull request #44374 from neikeq/mono-wasm-extra-framework-asms 
Mono: Add extra WASM framework assemblies on game export
 2020-12-17 09:56:46 +01:00
Rémi Verschelde ae0399382a
Merge pull request #44433 from akien-mga/scons-fix-platform-opts 
SCons: Add only selected platform's opts to env
 2020-12-17 09:56:07 +01:00
Rémi Verschelde 9e49dbda2a
Merge pull request #44360 from bruvzg/ctl_punct_word_break 
Add word breaks on punctuation characters.
 2020-12-17 09:02:01 +01:00
Rémi Verschelde 933cf114d8
Merge pull request #42872 from dreamsComeTrue/better-camera2d-zoom 
Fix camera2d zoom when set to zero (affine_invert: Condition ' det == 0 ' is true)
 2020-12-17 08:56:37 +01:00
Dominik 'dreamsComeTrue' Jasiński aba477361d Fix camera2d zoom when set to zero (causing ERROR: affine_invert: Condition ' det == 0 ' is true.) 
Fixes: #41873
 2020-12-16 23:42:12 +01:00
Rémi Verschelde fb2465b3c8
Merge pull request #44410 from KoBeWi/project--tools--thisPR 
Make tool menu plugins use Callables for callback
 2020-12-16 22:04:39 +01:00
Juan Linietsky 9c39b51c53
Merge pull request #44430 from reduz/reimplement-skeletons-blendshapes 
Reimplement skeletons and blend shapes
 2020-12-16 17:28:05 -03:00
kobewi 889f5e44ef Make tool menu plugins use Callables for callback 2020-12-16 20:23:51 +01:00
reduz bf77016c8a Reimplement skeletons and blend shapes 
Uses compute shaders, which only once, on demand, and all in parallel.
 2020-12-16 14:32:04 -03:00
Rémi Verschelde 0f84d8dc49
SCons: Add only selected platform's opts to env 
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-16 16:31:19 +01:00
Rémi Verschelde c514cc5822
Merge pull request #44429 from mbrlabs/rot-gizmo-handle 
Changed the rotation gizmo handle to use the active axis color
 2020-12-16 15:48:55 +01:00
Rémi Verschelde 88b8c3ec00
Merge pull request #44424 from briansemrau/gdscript-fix-and 
Fix gdscript `and` operator
 2020-12-16 14:42:56 +01:00
Marcus Brummer ec97962261 Changed the rotation gizmo handle to use the active axis color 2020-12-16 14:32:02 +01:00
Rémi Verschelde f17b34c479
Merge pull request #44341 from Faless/docs/4.x_os_unixtime 
Add important note about OS.get_unixtime.
 2020-12-16 14:30:25 +01:00
Rémi Verschelde 999b38cecd
Merge pull request #44366 from gongpha/fix-texture3d-texturearray-icon-rasterizing 
Improve Texture3D and TextureArray icons
 2020-12-16 14:19:54 +01:00
Rémi Verschelde b09332bd4e
Merge pull request #44404 from Chaosus/doc_direction_to 
Added a note describing a code behind Vector2/3.direction_to
 2020-12-16 14:18:59 +01:00
Rémi Verschelde 16a249bd22
Merge pull request #44414 from skyace65/TypeHint 
Document what can be used as a type hint
 2020-12-16 14:17:46 +01:00
Rémi Verschelde 3d7b01723b
Merge pull request #44412 from DanielZTing/rename 
Rename neighbour in Control to neighbor
 2020-12-16 14:16:28 +01:00
Rémi Verschelde 41a8bc40b9
Merge pull request #44423 from naithar/fix/text-edit-cursor 
[4.0] TextEdit virtual keyboard cursor fix
 2020-12-16 14:15:06 +01:00
Rémi Verschelde 98b8279df8
Merge pull request #44419 from winterpixelgames/PR-dissasemlber-fix-num-2 
fixes crash in disassembler for opcode OPCODE_ASSIGN_TYPED_NATIVE
 2020-12-16 13:52:18 +01:00
Brian Semrau 61ac640aa0 Fix gdscript and operator 2020-12-16 07:41:10 -05:00
Rémi Verschelde a7f59525c5
Merge pull request #44421 from madmiraal/fix-non-c-typedef-for-linkage 
Fix named anonymous struct warning
 2020-12-16 12:25:20 +01:00
Marcel Admiraal f9b83e90b2 Fix named anonymous struct warning 2020-12-16 07:42:16 +00:00
Jordan Schidlowsky 7d07e20bda fixes crash in disassemlber for opcode OPCODE_ASSIGN_TYPED_NATIVE 2020-12-15 21:44:52 -06:00
Sergey Minakov efeb9e4d08 GUI: use cursor in TextEdit for non selected text. 2020-12-16 05:41:14 +03:00
skyace65 dbcc9d3600 Document what can be used as a type hint 2020-12-15 19:16:43 -05:00