mirror/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-12-27 11:24:59 +08:00
Code Issues Packages Projects Releases Wiki Activity
31,368 Commits 15 Branches 59 Tags 8.7 GiB
f69339c2c2
Commit Graph

31368 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rémi Verschelde
f69339c2c2
Merge pull request #43692 from akien-mga/scons-leave-link-alone 
SCons: Remove unnecessary $LINK overrides
 2020-11-19 20:43:25 +01:00
Rémi Verschelde
71f53a5ba3
Merge pull request #43687 from akien-mga/macos-osxcross-link-arm64 
OSX: Fix linking with osxcross for arm64
 2020-11-19 17:14:42 +01:00
Rémi Verschelde
2e4bff1cfe
SCons: Remove unnecessary $LINK overrides 
As of SCons 4.0.1, the default value for $LINK is $SMARTLINK, which itself
is a function that will use $CXX as linker for C++:

https://github.com/SCons/scons/blob/4.0.1/SCons/Tool/link.py#L327-L328
https://github.com/SCons/scons/blob/4.0.1/SCons/Tool/link.py#L54-L76

So we don't need to manually specify the same value as $CXX for $LINK.
 2020-11-19 16:48:03 +01:00
Rémi Verschelde
dbbbb53927
OSX: Fix linking with osxcross for arm64 
For some reason the `-target` option on the `LINKFLAGS` was causing a weird
issue where osxcross' clang wrapper would attempt using the system `/bin/ld`
instead of the osxcross version (which is Apple's `ld64`).

The error message would be:
```
/bin/ld: unrecognized option '-dynamic'
```

Also removed from `CCFLAGS` for consistency, it seems to work fine with only
`-mmacosx-version-min`.
 2020-11-19 16:32:32 +01:00
Rémi Verschelde
c9bd11a479
Merge pull request #43668 from GryphonClaw/master 
added shortcuts/hotkeys for tileset editor plugin collision buttons, …
 2020-11-19 14:17:23 +01:00
Rémi Verschelde
b4f81e7b88
Merge pull request #43662 from EricEzaM/PR/INP3-command_serialization_optional 
Made serialization of Command toggleable when saving InputEvents.
 2020-11-19 13:38:55 +01:00
Rémi Verschelde
8cc01be213
Merge pull request #43682 from RandomShaper/warn_reference_singleton 
Warn about singleton being a Reference
 2020-11-19 13:37:45 +01:00
Eric M
c92f83d3ca Made serialization of Command toggleable when saving InputEvents. 
Made serialization of Command optional. If command is serialized, Control (On Win/Linux) or Meta (on Mac) are not.
Example use case: You are on Windows and you set a shortcut to be Control + E. This would serialize as Command=true and Control=true. If you then run this project on Mac, you would need to press Command AND Control to activate the shortcut - which is not what is intended. Now, you can set store_command to true, and it will only serialize to Command = true (no Control serialized). On Windows, this means Control. On Mac, it means only command.
 2020-11-19 21:05:45 +10:00
Pedro J. Estébanez
e1150bd912 Warn about singleton being a Reference 2020-11-19 12:01:54 +01:00
Rémi Verschelde
b115ea4c28
Merge pull request #43681 from aaronfranke/grid-view-update 
Update the 3D grid when the "View Grid" checkbox is changed
 2020-11-19 11:56:41 +01:00
Aaron Franke
71d1909b39
Update the 3D grid when the "View Grid" checkbox is changed 2020-11-19 05:29:37 -05:00
Rémi Verschelde
68f2417528
Merge pull request #43665 from Nickswoboda/fix-invalid-free 
Check uniform set validity before freeing
 2020-11-19 10:06:51 +01:00
Rémi Verschelde
05b17d3dbf
Merge pull request #43664 from Phischermen/quit-documentation 
Clarify that SceneTree::quit() does not immediately end the application.
 2020-11-19 10:04:59 +01:00
Rémi Verschelde
319126a039
Merge pull request #43671 from m4gr3d/fix_zipalign_bug_on_windows 
Fix zipalign command name on Windows machines
 2020-11-19 09:00:47 +01:00
Fredia Huya-Kouadio
c4f2d87747 Fix zipalign command name on Windows machines. 2020-11-18 23:30:45 -08:00
Rémi Verschelde
2ca1c17a5c
Merge pull request #43661 from EricEzaM/PR/INP2-rename_load_from_globals 
load_from_globals() -> load_from_project_settings()
 2020-11-19 07:40:21 +01:00
Rémi Verschelde
eebd3e8aa1
Merge pull request #43657 from RandomShaper/fix_dupe_crash 
Fix crash duplicating local-to-scene resources
 2020-11-19 07:33:45 +01:00
GryphonClaw
cf582262c2 added shortcuts/hotkeys for tileset editor plugin collision buttons, with suggested changes. 2020-11-18 19:54:27 -08:00
Nick Swoboda
bce3e2c3f6 Check uniform set validity before freeing 2020-11-18 16:53:11 -08:00
Phischermen
371d12a2f0 Clarify that SceneTree::quit() does not immediately end the application. 2020-11-18 16:45:20 -08:00
Eric M
e5376fb129 load_from_globals() -> load_from_project_settings() 2020-11-19 09:21:21 +10:00
Pedro J. Estébanez
e99cf6bfe5 Fix crash duplicating local-to-scene resources 2020-11-18 23:45:30 +01:00
Rémi Verschelde
a3a3b02bed
Merge pull request #43639 from timothyqiu/rotation-fix 
Fixes rotation in select mode on macOS
 2020-11-18 21:58:24 +01:00
Rémi Verschelde
818434fbcb
Merge pull request #43654 from qarmin/multiple_projects 
Allow to open multiple projects when some are not imported or without main scene.
 2020-11-18 21:57:42 +01:00
Rafał Mikrut
b20c20a6f7 Allow to open multiple projects when some are not imported or without main scene. 2020-11-18 21:24:27 +01:00
Rémi Verschelde
8028663a4b
Merge pull request #43651 from winterpixelgames/PR-fix-validation-layers-parse 
allow vulkan validation layers in release builds if explicity asked for
 2020-11-18 21:22:04 +01:00
Jordan Schidlowsky
e9527d0353 allow vulkan validation layers in release builds if explicity asked for 2020-11-18 14:07:28 -06:00
Rémi Verschelde
9a3d3df0e2
Merge pull request #43645 from vnen/variant-builtin-ret-type-fix 
Fix return type on builtin validated calls
 2020-11-18 15:00:18 +01:00
George Marques
bd93547c83
Fix return type on builtin validated calls 
Before it was being set to the base type instead of the actual return
type.
 2020-11-18 10:35:16 -03:00
Rémi Verschelde
cd6afc05d1
Revert "nanosvg: Sync with upstream cc6c08d" 
This reverts commit f697e7879b.

Part of the update introduced a regression:
https://github.com/memononen/nanosvg/issues/188.

We could include a local revert of the problematic commit but let's just do a
full revert to our previous version, and I'll re-update once the regression
is fixed upstream.

Fixes #43641.
 2020-11-18 13:23:17 +01:00
Rémi Verschelde
48a760da55
Merge pull request #43640 from akien-mga/gltf-workaround-bogus-images 
glTF: Workaround import failure with invalid embedded images
 2020-11-18 13:22:28 +01:00
Rémi Verschelde
f70cc0a60e
glTF: Workaround import failure with invalid embedded images 
image/gif is not supported in the glTF 2.0 specification,
these files are broken. But let's be lenient...

Fixes #43638.
 2020-11-18 11:34:01 +01:00
Haoyu Qiu
381ba7d554 Fixes rotation in select mode on macOS 2020-11-18 18:16:22 +08:00
Rémi Verschelde
bfed10185a
Merge pull request #43630 from mbrlabs/nodepath-fix-2 
Fixed deletion of nodes with exported node paths
 2020-11-18 08:58:01 +01:00
Rémi Verschelde
2ed7b8d5b6
Merge pull request #43633 from akien-mga/nanosvg-cc6c08d 
nanosvg: Sync with upstream cc6c08d
 2020-11-18 08:36:45 +01:00
Rémi Verschelde
f697e7879b
nanosvg: Sync with upstream cc6c08d 
Includes some loop condition fixes after fuzzing.
 2020-11-18 08:21:46 +01:00
Marcus Brummer
3629651ef8 Fixed deletion of nodes with exported node paths 2020-11-18 00:12:32 +01:00
Rémi Verschelde
8ac9a97956
Merge pull request #43621 from Faless/fix/4.x_cli_export 
Fix CLI export when export_path is in preset.
 2020-11-17 21:59:57 +01:00
Rémi Verschelde
bfb6c97da4
Merge pull request #43622 from madmiraal/fix-js-missing-semi-colons 
Add missing javascript semi-colons.
 2020-11-17 21:00:34 +01:00
Fabio Alessandrelli
aa15f7619a
Merge pull request #43623 from madmiraal/fix-js-lgtm-warning 
Fix godot_js_websocket_send function unused assignment.
 2020-11-17 20:37:51 +01:00
Marcel Admiraal
112e2fdfc3 Fix godot_js_websocket_send function unused assignment. 2020-11-17 18:28:39 +00:00
Marcel Admiraal
f42284ed07 Add missing javascript semi-colons. 2020-11-17 18:18:46 +00:00
Fabio Alessandrelli
032a1c5dc3 Fix CLI export when export_path is in preset. 
Export presets contains the export_path option, to specify the default
export location, but the CLI export option disregarded that, and always
required and export path to be specified.
After this commit, if the export path is not specified in the command,
the one in the preset will be used, erroring only if it's not present or
invalid.
 2020-11-17 18:26:03 +01:00
Rémi Verschelde
c56a071d0c
Merge pull request #42412 from Xrayez/doc-image-texture 
Describe `ImageTexture`, `Image` creation and usage
 2020-11-17 16:17:33 +01:00
Rémi Verschelde
b59a6fc40e
Merge pull request #38201 from Calinou/editor-f2-rename-node 
Require Ctrl for switching between editors, bind F2 to Rename Node
 2020-11-17 15:09:39 +01:00
Rémi Verschelde
3d02d2e3b8
Merge pull request #43614 from akien-mga/save-debugger-options 
Debugger: Save options in project metadata
 2020-11-17 15:01:31 +01:00
Andrii Doroshenko (Xrayez)
0ee88d6705 Describe ImageTexture, Image creation and usage 2020-11-17 16:00:41 +02:00
Rémi Verschelde
408effa688
Merge pull request #43612 from akien-mga/variant-utils-doc 
doc: Sync classref with Variant utility methods
 2020-11-17 13:50:08 +01:00
Rémi Verschelde
31865fcf3f
i18n: Sync translations with Weblate 
(cherry picked from commit e95af7ae9b)
 2020-11-17 13:21:03 +01:00
Rémi Verschelde
090361f3c9
Debugger: Save options in project metadata 
Fixes #19542.
 2020-11-17 13:03:37 +01:00