godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
30,929 Commits 15 Branches 59 Tags 2.2 GiB
c8716734eb
Commit Graph

30929 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rémi Verschelde
6dc41b3ad2
Merge pull request #42623 from lolleko/incorrect-macos-platform-name-csharp 
C# GodotTools: Replace platform Identifier "OSX" with "macOS"
 2020-10-09 08:17:06 +02:00
George Marques
fe6109101f
Merge pull request #41881 from ThakeeNathees/crash-on-builtin-constructor 
GDScript crash on builtin type constructor fix
 2020-10-08 19:35:35 -03:00
Rémi Verschelde
67135f246e
Merge pull request #42647 from nekomatata/x11-unfocus-crash-fix 
Fix x11 display server crash when deleting popup window when unfocused
 2020-10-08 20:05:06 +02:00
Marcel Admiraal
0e12a0c66a Reapply -Avoid adding margin twice along capsule Y axis 
Co-authored-by: Andrea Catania <info@andreacatania.com>
 2020-10-08 16:22:38 +01:00
PouleyKetchoupp
48a0d44e67 Fix x11 display server crash when deleting popup window when unfocused 
On FocusOut events, the window could be destroyed while propagating
WINDOW_EVENT_FOCUS_OUT event, which causes the WindowData to be
invalidated, and still used for calls to XUnsetICFocus.

This change moves calls to XUnsetICFocus, and also XSetICFocus in
FocusIn events, before propagating the change of focus event to the
engine, to be safe in any case.

Also setting xic member to nullptr after all calls to XDestroyIC to keep
things clean and consistent.

Fixes #42645
 2020-10-08 17:22:03 +02:00
Rémi Verschelde
28e45ec427
Merge pull request #42644 from Anutrix/uwp-duplicate-entry-fix 
Fixed an issue in UWP export caused by duplicate entry for extensions in content types file.
 2020-10-08 15:46:35 +02:00
Rémi Verschelde
53a3dfbf6b
Merge pull request #42622 from darkclif/master 
Docs change: More detailed description of StreamPeerTCP.is_connected_to_host()
 2020-10-08 15:18:02 +02:00
Rémi Verschelde
abbd58dcb0
Merge pull request #42621 from KoBeWi/into_nothingness_no_more 
Cancel rename if file does not exist
 2020-10-08 15:17:32 +02:00
unknown
9cb46ed4e7 Fixed an issue in UWP export caused by duplicate entry for extensions in content types file. 2020-10-08 18:44:15 +05:30
Rémi Verschelde
899b900427
Merge pull request #42639 from AndreaCatania/revert_1 
Reverted physics body spawn optimization #39726 #40252
 2020-10-08 14:20:08 +02:00
Lorenz Junglas
7e2b495435 Adressed Review 
Identifier "macOS" => "MacOS"
Platform/SDK name reverted to "osx"
 2020-10-08 13:51:19 +02:00
Lorenz Junglas
519f369795 C# GodotTools: Replace platform Identifier "OSX" with "macOS" 
Because `Strings OS_OSX::get_name() const` now returns "macOS" (15a9f94346)
The C# GodotTools were still using "OSX" as identifier a few things were borken (e.g. dotnet/msbuild detection).
 2020-10-08 13:51:19 +02:00
Andrea Catania
2e8cb8a9e2 Fixed #41040 in an alternative way now that #39726 is reverted 2020-10-08 13:10:48 +02:00
Tomasz Chabora
bb2684f4a7 Cancel rename if file does not exist 2020-10-08 13:00:23 +02:00
Andrea Catania
1829c67762 Revert "Optimized physics object spawn time and optimized shape usage when the shape is not scaled" 
This reverts commit 7709a83493.
 2020-10-08 12:22:59 +02:00
Andrea Catania
8827e315d4 Revert "- Enhanced the flush mechanism by flushing only needed thing." 
This reverts commit 8d0d6d6921.
 2020-10-08 12:16:12 +02:00
Rémi Verschelde
8be6db951d
Merge pull request #42634 from akien-mga/scons-warnings-gcc-Wsuggest-override 
SCons: Refactor and cleanup warnings definition
 2020-10-08 11:50:07 +02:00
Rémi Verschelde
97f116d36b
SCons: Refactor and cleanup warnings definition 2020-10-08 10:58:05 +02:00
Rémi Verschelde
104cfaefcd
Merge pull request #42610 from jak6jak/set_values 
Fixed a bug which caused Set Index to not function
 2020-10-08 10:23:29 +02:00
Rémi Verschelde
8a4f402bcb
Merge pull request #42615 from akien-mga/fixup-40097 
Fix build after merge of #40097
 2020-10-07 17:26:36 +02:00
Sniff
7970e4a433
Docs change: More detailed description of StreamPeerTCP.is_connected_to_host() 2020-10-07 16:35:33 +02:00
Rémi Verschelde
0d8bd93e40
Fix build after merge of #40097 
CI had passed back then but this would have needed a rebase to
take into account recent changes to String.
 2020-10-07 14:23:44 +02:00
Rémi Verschelde
cb77e8d6cf
Merge pull request #40097 from mrushyendra/file_sort_master 
Fix natural sort comparison for strings with large numbers
 2020-10-07 13:59:14 +02:00
Jacob Edie
d76457a7f3 added temp variable because *p_inputs[2] is the same as *p_outputs[0] 2020-10-06 22:12:47 -04:00
Rémi Verschelde
e93af13959
Merge pull request #42606 from aaronfranke/cs-vec2-rotated 
Improve the Vector2 rotated code in C#
 2020-10-06 23:45:15 +02:00
Aaron Franke
bea7d61fd9
Improve the Vector2 rotated code in C# 2020-10-06 15:57:47 -04:00
Rémi Verschelde
07112b92a8
Merge pull request #42598 from KoBeWi/update_setting_or_something 
Update the setting when clicking Show hidden files
 2020-10-06 16:01:55 +02:00
Tomasz Chabora
725c2bdf48 Update the setting when clicking Show hidden files 2020-10-06 15:42:25 +02:00
Umang Kalra
10a7eddc5e Explaining the behavior of focus & pressed stylebox overlap 2020-10-06 17:44:33 +05:30
Rémi Verschelde
ed333248f5
Merge pull request #42314 from mbrlabs/nodepath-fix 
Fixed renaming/moving of nodes with exported NodePaths in the editor
 2020-10-06 12:04:46 +02:00
Marcel Admiraal
47431dbb8e Initialise Bullet RigidBody friction to the expected value of 1.0 2020-10-06 09:10:05 +01:00
Rémi Verschelde
3249305892
Merge pull request #42591 from akien-mga/windows-subsystem-default 
SCons: Add 'default' parameter for windows_subsystem, restores original behavior
 2020-10-06 09:54:12 +02:00
Rémi Verschelde
3a54fd94b0
Merge pull request #42589 from Duroxxigar/add-animplayer-error-msg 
Added more helpful error message for animation player
 2020-10-06 09:45:19 +02:00
Rémi Verschelde
182d6d6f42
SCons: Add windows_subsystem=default, restores original behavior 
We want debug builds to have a console and easy stdout redirection by default.
Windows makes reading the stdout/stderr stream from gui applications too cumbersome
(and most users don't know about it, and just wonder why they don't see a thing).
 2020-10-06 09:30:46 +02:00
Duroxxigar
8bfeb9d6ae Added a more helpful error message when there is no current animation for the animation player 2020-10-06 01:21:23 -04:00
Rémi Verschelde
9b4399a509
Merge pull request #42580 from aaronfranke/has-clear 
Check for global script class information before clearing it
 2020-10-05 22:09:27 +02:00
Aaron Franke
1ca501d7d4
Check for global script class information before clearing it 2020-10-05 15:45:54 -04:00
Rémi Verschelde
437e0be811
Merge pull request #42577 from fire/japanese-bone-name-gltf-master 
Better non alphanumeric bone names.
 2020-10-05 20:44:50 +02:00
Rémi Verschelde
437a9393b7
Merge pull request #42571 from akien-mga/fix-binary-format-load-error 
Improve format version mismatch error in binary loader
 2020-10-05 20:30:24 +02:00
K. S. Ernest (iFire) Lee
7b76f8783f Better non alphanumeric bone names. 
1. _gen_unique_bone_name(Ref<GLTFState> state, const GLTFSkeletonIndex skel_i, const String &p_name) won't return an empty string.

2. String GLTFDocument::_sanitize_bone_name(const String &name) will keep Japanese characters. Like: "全ての親".

3. The sanitize function allows  the bone name to be not just alphanumeric. The only required conditions are the ones in add_bone.

> ERR_FAIL_COND(p_name == "" || p_name.find(":") != -1 || p_name.find("/") != -1);
 2020-10-05 09:25:37 -07:00
Rémi Verschelde
7d312448ad
Merge pull request #42504 from akien-mga/glTF-fix-image-loading 
glTF: Fix parsing image data with `mimeType` undefined
 2020-10-05 15:02:18 +02:00
Rémi Verschelde
e35bb04c53
Improve format version mismatch error in binary loader 2020-10-05 14:49:41 +02:00
Rémi Verschelde
2e99d0b26f
glTF: Fix parsing image data with mimeType undefined 
The glTF 2.0 spec only makes `mimeType` mandatory for `bufferView` image data,
so the previous logic to handle URIs with base64-encoded images could fail if
`mimeType` is undefined.

The logic was documented and refactored to better handle the spec, notably:

- `uri` and `bufferView` are now mutually exclusive, and only the latter fails
  if `mimeType` is undefined.
- `uri` with a file path will now respect the `mimeType` if defined, and thus
  attempt loading the file with the specified format (even if its extension is
  not the one expected for this format). So we can support bad extensions (PNG
  data with `.jpg` extension) or custom ones (PNG data in `.img` file for
  example).
- `uri` with base64 encoded data will infer MIME type from `data:image/png` or
  `data:image/jpeg` if it was not documented in `mimeType` initially.
- `uri` with base64 encoded data, no `mimeType` and `application/octet-stream`
  or `application/gltf-buffer` will fall back to trying both PNG and JPEG
  loaders.

Fully fixes #33796 (and fixes up #42501).
 2020-10-05 13:06:50 +02:00
David Sichma
7701889048 aabb change updates bounding box 
spatial editor will now update the bounding box if aabb or transform
changes
 2020-10-05 12:56:57 +02:00
Rémi Verschelde
3556bc48a1
Merge pull request #42439 from Xrayez/doc-gdscript-load-and-resloader-xref 
Cross-reference GDScript `load` and `ResourceLoader.load` in classref
 2020-10-04 20:48:07 +02:00
Rémi Verschelde
59e7a5a94f
Merge pull request #42561 from Faless/js/build_no_config 
[HTML5] Scons now expects "emcc" to be in PATH.
 2020-10-04 20:45:55 +02:00
Fabio Alessandrelli
7998745237 [HTML5] Scons now expects "emcc" to be in PATH. 
No longer parse emscripten/emsdk config to detect emcc/node paths.
Use WhereIs to find "emcc" and "node", look for "node_modules" in "emcc"
path.
 2020-10-04 14:26:44 +02:00
Rémi Verschelde
2033bacba4
Merge pull request #42550 from clayjohn/VULKAN-decal-srgb 
Return proper texture view format for decals
 2020-10-04 11:00:33 +02:00
Yuri Roubinsky
2374281f36
Merge pull request #42553 from Chaosus/vs_fix_typo 
Fix typo in VisualShaderNodeSample3D::generate_code
 2020-10-04 10:53:48 +03:00
Yuri Roubinsky
2d45f7ac87 Fix typo in VisualShaderNodeSample3D::generate_code 2020-10-04 10:34:58 +03:00