Commit Graph
28211 Commits
Author SHA1 Message Date
lawnjelly 1394df3188 Prevent item joining with custom shaders using selected BUILTINs
Large FVF allows batching of many custom shaders, but should not join items which have shaders that utilize BUILTINs which would change for each item, because these will not be sent individually, and all joined items would wrongly use the values from the first joined item.
2020-11-19 15:09:33 +00:00
Rémi VerscheldeandGitHub 3a8e1f324f Merge pull request #43679 from lawnjelly/ewok_rect_color_fix
Prevent poly color path when translating batches than are non-poly
2020-11-19 11:56:02 +01:00
Rémi VerscheldeandGitHub 93936ad978 Merge pull request #43678 from bruvzg/fix_focus_loss
Fix focus loss on macOS.
2020-11-19 11:55:37 +01:00
lawnjelly f84f1e8b81 Prevent poly color path when translating batches than are non-poly
A previous fix for poly colors had caused a regression in the rect behaviour, this PR re-enables proper translation of rect batches.
2020-11-19 10:10:09 +00:00
bruvzg 718ff146e0 Fix focus loss on macOS. 2020-11-19 11:55:25 +02:00
Rémi Verschelde 68973cadf7 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.

(cherry picked from commit f70cc0a60e)
2020-11-18 13:28:51 +01:00
Marcus BrummerandRémi Verschelde 420df0c2a8 Fixed deletion of nodes with exported node paths
(cherry picked from commit 3629651ef8)
2020-11-18 13:27:47 +01:00
Rémi VerscheldeandGitHub b30d2e5d39 Merge pull request #43642 from lawnjelly/ewok_blank_uvs
Batching - blank UVs in polys that contain no UVs
2020-11-18 12:27:47 +01:00
lawnjelly 4cadae5713 Batching - blank UVs in polys that contain no UVs
Polys that have no texture assigned contain no UVs in the poly command. These were previously not blanked, leading to random values if read from a custom shader.

This PR just blanks them.
2020-11-18 10:36:47 +00:00
Rémi VerscheldeandGitHub 545931545c Merge pull request #43631 from RandomShaper/fix_no_window_3.2
Ignore query to maximize/minimize window on Windows and X11
2020-11-18 09:11:56 +01:00
Pedro J. Estébanez 0642f3efeb Ignore query to maximize/minimize window on Windows and X11
This makes these platform behave as MacOS in that regard and also fixes the editor window appearing in some cases even when --no-window has been passed.
2020-11-18 00:33:39 +01:00
Marcel AdmiraalandRémi Verschelde 04103db6bd Fix godot_js_websocket_send function unused assignment.
(cherry picked from commit 112e2fdfc3)
2020-11-17 22:25:49 +01:00
Marcel AdmiraalandRémi Verschelde e1b72e1943 Add missing javascript semi-colons.
(cherry picked from commit f42284ed07)
2020-11-17 22:25:32 +01:00
Fabio AlessandrelliandRémi Verschelde f32c878ef7 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.

(cherry picked from commit 032a1c5dc3)
2020-11-17 22:23:09 +01:00
Rémi Verschelde 755ee76871 Revert "Add script class categories to EditorInspector."
This reverts commit 8a02f221b4.

This caused regression #43491.
2020-11-17 22:21:32 +01:00
Rémi VerscheldeandGitHub 04698a6d96 Merge pull request #43620 from Xrayez/doc-image-texture-3.2
[3.2] Describe `ImageTexture`, `Image` creation and usage
2020-11-17 17:37:49 +01:00
Andrii Doroshenko (Xrayez) 2edd489f83 Describe ImageTexture, Image creation and usage
Ported from commit 0ee88d6705.
2020-11-17 18:06:52 +02:00
Rémi Verschelde 08028fa1ee glad: Sync with upstream 0.1.34 2020-11-17 16:42:42 +01:00
Rémi Verschelde 4816317bbc Debugger: Save options in project metadata
Fixes #19542.

(cherry picked from commit 090361f3c9)
2020-11-17 16:42:42 +01:00
Hugo LocurcioandRémi Verschelde fcab27878c Require Ctrl for switching between editors, bind F2 to Rename Node
Switching between editors now requires holding Ctrl to avoid
conflicts with the new F2 shortcut.

The asset library can now be accessed by pressing Ctrl + F4
on Windows and Linux, or Alt + 4 on macOS.

This partially addresses #38139.

(cherry picked from commit 79e4e26738)
2020-11-17 16:24:06 +01:00
Rémi VerscheldeandGitHub d099b6cf60 Merge pull request #43606 from NHodgesVFX/3.2
Make lights_per_object configurable
2020-11-17 16:20:38 +01:00
UnknownandNHodgesVFX 5965fbd9fa Make lights_per_object configurable 2020-11-17 10:03:44 -05:00
Rémi VerscheldeandGitHub 8dde60d133 Merge pull request #43613 from akien-mga/3.2-cherrypicks
Cherry-picks for the 3.2 branch (future 3.2.4) - 8th batch
2020-11-17 13:07:26 +01:00
Rémi Verscheldeandlawnjelly fc718d87a6 doc: Add description for rendering/quality/2d/use_transform_snap
Co-authored-by: lawnjelly <lawnjelly@gmail.com>
2020-11-17 12:23:58 +01:00
Rémi Verschelde e95af7ae9b i18n: Sync translations with Weblate 2020-11-17 12:21:11 +01:00
Pedro J. EstébanezandRémi Verschelde 58e9bf494d Fix crash in resoure duplicate
(cherry picked from commit 9450717571)
2020-11-17 12:07:02 +01:00
Marcus BrummerandRémi Verschelde a822bb9844 Fixed exit code retrieval of spawned processes on Windows
Use GetExitCodeProcess() on Windows to retrieve the exit code of a process in
OS:excute()

(cherry picked from commit f0f4220b05)
2020-11-17 12:07:02 +01:00
Hugo LocurcioandRémi Verschelde 3a46e01af3 Remove property groups for Pause Mode and Script
Each of those only grouped 1 property, making them useless.

This closes https://github.com/godotengine/godot-proposals/issues/1840.

(cherry picked from commit 5770e08c2a)
2020-11-17 12:07:02 +01:00
Ryan Roden-CorrentandRémi Verschelde 07c8e25078 Clarify Curve3D.get_point_{in,out} position in doc.
I verified this experimentally. I added a point at roughly (1,0,0), and
dragged a handle back to the origin. The result was:

```
get_point_position: (0.991079, 0, -0.000069)
get_point_in: (0.993409, 0, 0)
get_point_out: (-0.993409, 0, 0)
```

(cherry picked from commit c6093ae612)
2020-11-17 12:07:02 +01:00
Tomasz ChaboraandRémi Verschelde 2a98c5ff04 Allow folder checking in export preset file list
(cherry picked from commit 08a292fec3)
2020-11-17 12:07:02 +01:00
Tomasz ChaboraandRémi Verschelde 17af75953f Correct the doc about Tree.get_edited
(cherry picked from commit b8145c182b)
2020-11-17 12:07:02 +01:00
Hugo LocurcioandRémi Verschelde e53a5f6be5 Improve the Dictionary class documentation
- Mention Lua-style syntax.
- Make the code samples self-contained.
- Mention caveat with `const` (also in Array).
- Clarify the description of `size()`.

This closes https://github.com/godotengine/godot-docs/issues/4272.

(cherry picked from commit 5325de4e6b)
2020-11-17 12:07:02 +01:00
Hugo LocurcioandRémi Verschelde 92f81ff782 Clarify packet peer max_buffer_po2 in ProjectSettings documentation
This closes https://github.com/godotengine/godot-docs/issues/4364.

(cherry picked from commit c475b1fd0b)
2020-11-17 12:07:02 +01:00
Haoyu QiuandRémi Verschelde 8361caad86 Allows HTTPClient to talk to proxy server
* Makes request uri accept absolute URL and authority
* Adds Host header only when missing

(cherry picked from commit d92ca6fbb1)
2020-11-17 12:07:01 +01:00
Connor LirotandRémi Verschelde 1e01963d29 Fix for linux joypad D-pad zeroing
Some controllers (notably those made by 8bitdo) do not always emit an event to zero out a D-pad axis before flipping direction. For example, when rolling around aggressively the D-pad of an 8bitdo SN30 Pro/Pro+, the following may be observed:

```
ABS_HAT0X : -1
ABS_HAT0Y : -1
ABS_HAT0Y : 0
ABS_HAT0Y : 1
ABS_HAT0X : 1
```

Notable here is that no event for `ABS_HAT0X: 0` is emitted between the events for `ABS_HAT0X: -1` and `ABS_HAT0X: 1`. Consequently, the game engine believes that both the negative _and_ positive x-axis directions of the D-pad are activated simultaneously (i.e `is_joy_button_pressed()` returns `true` for both `JOY_BUTTON_DPAD_LEFT` and `JOY_BUTTON_DPAD_RIGHT`), which should be impossible.

This issue is _not_ reproducible on all controllers. The Xbox One controller in particular will not exhibit this problem (it always emits zeroing out events for an axis before flipping direction).

The fix is to always zero out the opposite direction on the D-pad axis in question when processing an event with a nonzero value. This unfortunately wastes a small number of CPU cycles on controllers that behave nicely.

**I have verified this issue is also reproducible in the stable 3.2 branch**

(cherry picked from commit dd021099ff)
2020-11-17 12:07:01 +01:00
Michael AlexsanderandRémi Verschelde fc1f5e149f Fix WAV resources ignoring the AudioServer's 'global_rate_scale' value
(cherry picked from commit 04ebe4e7a4)
2020-11-17 12:07:01 +01:00
Tomasz ChaboraandRémi Verschelde 00c631b13c Release pressed action if event is removed
(cherry picked from commit b7c612bd54)
2020-11-17 12:07:00 +01:00
Aaron FrankeandRémi Verschelde 3b10458a5d Add HexEncode to C#
(cherry picked from commit 6b54d7dde1)
2020-11-17 12:02:00 +01:00
Aaron FrankeandRémi Verschelde e3419a7fe1 Add LStrip and RStrip to C# strings
(cherry picked from commit c89af1d433)
2020-11-17 12:01:59 +01:00
Vaughan LingandRémi Verschelde 7a9660e8d2 Change android orientations from sensor to user
# Conflicts:
#	platform/android/java/lib/src/org/godotengine/godot/GodotIO.java

(cherry picked from commit d658063833)
2020-11-17 12:01:59 +01:00
Hugo LocurcioandRémi Verschelde 312d4aa390 Add files to create a Windows editor installer using Inno Setup
This partially addresses
https://github.com/godotengine/godot-proposals/issues/1432.

To fully address the proposal above, official Windows installers will
have to be compiled and distributed.

(cherry picked from commit 8baa303d15)
2020-11-17 12:01:59 +01:00
Hugo LocurcioandRémi Verschelde c9a694a11d Rename the "Delete" option in the FileSystem dock to "Move to Trash"
It actually moves files to the system trash instead of removing them
completely.

(cherry picked from commit e7ed287fda)
2020-11-17 12:01:59 +01:00
Hugo LocurcioandRémi Verschelde 12681b497b Improve messages related to overriding the default editor layout
This closes #33884.

(cherry picked from commit b324a929f6)
2020-11-17 12:01:59 +01:00
Nathan FrankeandRémi Verschelde 84c04a8ee3 Fix Android Export jarsigner error with *.import whitelist
(cherry picked from commit 20bca313c0)
2020-11-17 12:01:59 +01:00
Fredia Huya-KouadioandRémi Verschelde 566835e181 Update the logic to query for the 'scons' command executable path.
(cherry picked from commit 46cc3233d8)
2020-11-17 12:01:59 +01:00
Marcus BrummerandRémi Verschelde 75f33fddab Added the .jks file extension as valid preset for Android keystore files
(cherry picked from commit e1b9be4a6b)
2020-11-17 12:01:59 +01:00
FeniksandRémi Verschelde c58b5c5df4 Changed mouse cursor to the caret (text cursor) location.
(cherry picked from commit 59ed3c1aaf)
2020-11-17 12:01:58 +01:00
Rémi Verschelde d81b8e4a86 SceneTree: Fix reparent crash with animation tracks renaming disabled
This check was there since the first commit in 2014, but a later feature added in 2018
with #17717 did not properly update the code while adding non animation-related code
in `perform_node_renames`.

Fixes #40532.

(cherry picked from commit d107fd4c9e)
2020-11-17 12:01:58 +01:00
Wilson E. AlvarezandRémi Verschelde aa6406874e Document InstancePlaceholder.create_instance not being thread-safe.
(cherry picked from commit a6f3ef3ac7)
2020-11-17 12:01:58 +01:00
Haoyu QiuandRémi Verschelde beddfb4437 Keep cursor relative position after multiline move
(cherry picked from commit 87fb2bde0c)
2020-11-17 12:01:58 +01:00