bf1de6bbfa
Revert backport of 2D transform and camera snapping options
...
More work is needed to make sure that those options actually solve users' issues, so we prefer to remove the options for 3.2.4 and revisit for a future release.
2021-03-05 14:20:31 +00:00
8a020a6573
Merge pull request #46662 from Calinou/doc-bakedlightmap-hdr
...
Improve the BakedLightmap `use_hdr` documentation
2021-03-05 15:14:33 +01:00
ff6cf26286
Merge pull request #46664 from Calinou/doc-margincontainer-theme-constant-3.2
...
Use safer `add_theme_constant_override()` in MarginContainer code sample
2021-03-05 15:12:03 +01:00
f2ad10f957
Merge pull request #46666 from Pop0p/3.2_bug_get_joy_button_index_from_string
...
Fix a crash when using Input.get_joy_button_index_from_string()
2021-03-05 12:08:43 +01:00
07fc567d03
Fix a crash when using Input.get_joy_button_index_from_string()
...
There was a missing comma between two elements in the _buttons array
2021-03-05 11:17:18 +01:00
d70258707d
Merge pull request #46676 from lawnjelly/ewok_modulate_shader
...
Batching - fix custom MODULATE shader applying modulate twice
2021-03-05 10:44:49 +01:00
cad3771ce7
Merge pull request #46623 from Janglee123/tilemap-collision-show
...
Added `show_collision` property for tilemap node.
2021-03-04 23:40:17 +01:00
c401960634
Batching - fix custom MODULATE shader applying modulate twice
...
One of the new fvf types (FVF_MODULATED) allows batching custom shaders that use modulate. The only slight oversight is that there is a special define when MODULATE is used in a custom shader, called MODULATE_USED, that is checked, and if set it does NOT apply final_modulate as part of canvas.glsl.
This MODULATE_USED define wasn't checked when the new FVF was used and modulate was passed in an attribute.
This PR moves the application of the final_modulate into the #ifndef MODULATE_USED section.
2021-03-04 20:28:57 +00:00
7b6cc3e687
Added `show_collision` property.
...
If true, collision shapes are shown in the editor and at run-time.
Requires Visible Collision Shapes to be enabled in the Debug menu,
for collision shapes to be visible at run-time.
2021-03-05 01:21:40 +05:30
e90f08642d
Use safer `add_theme_constant_override()` in MarginContainer code sample
...
Control has magic setters to set custom theme items, but using the
dedicated Control methods is less prone to typos so it should be favored.
2021-03-04 17:18:51 +01:00
f3496529dd
Improve the BakedLightmap `use_hdr` documentation
...
See https://github.com/godotengine/godot/issues/46442 .
2021-03-04 17:10:29 +01:00
60f1219897
Merge pull request #46658 from akien-mga/3.2-cherrypicks
...
Cherry-picks for the 3.2 branch (future 3.2.4) - 27th batch
2021-03-04 16:07:51 +01:00
4d06a5c2b0
Mono/macOS: Separate data dir into frameworks and resources for codesigning
...
Co-authored-by: Ignacio Etcheverry <ignalfonsore@gmail.com>
(cherry picked from commit 42eb09ddcc
2021-03-04 12:21:17 +01:00
138d5121eb
Fix crash trying to destroy an ImageTexture object containing a null texture
...
The problem happened when `ImageTexture::create_from_image` was called
with an empty image. In this situation an RID was allocated despite the
texture being null. The destructor would then crash trying to acess this
null texture.
Fixes #46274
(cherry picked from commit 46218d8c37
2021-03-04 12:21:17 +01:00
b82d5688b9
Deselect column only if belongs to deselected item
...
(cherry picked from commit 5cd5722f6a
2021-03-04 12:20:35 +01:00
6ea1e97e06
Add null check for NavigationMesh.create_from_mesh()
...
(cherry picked from commit cf6bfea93f
2021-03-04 11:41:46 +01:00
216aba8228
Add size<=0 check in BakedLighmapData._get_user_data()
...
(cherry picked from commit 18bb6e74be
2021-03-04 11:41:10 +01:00
eec2731eb2
Fix crash on HTTPClient::poll method
...
The problem happened because `poll` assumed that when the SSL flag was
true, the `connection` would be a subclass of StreamPeerSSL. However
that invariant could be broken by calling HTTPClient::set_connection
with a `connection` that is not a subclass of StreamPeerSSL.
Fixes #46138
(cherry picked from commit a3a731ed92
2021-03-04 11:39:51 +01:00
5022103ee7
Make Color::from_hsv use Color::set_hsv
...
(cherry picked from commit b59a06da25
2021-03-04 11:39:02 +01:00
292c9e380a
Make Camera2D's editor helper code only be compiled on editor builds
...
(cherry picked from commit f70ccbca52
2021-03-04 11:35:39 +01:00
ced5f5398a
add msan sanitizer option for linus/bsd, lsan option for osx
...
(cherry picked from commit da35cd2f00
2021-03-04 11:33:35 +01:00
3f36ca7323
HTTPRequest: Improve response when disconnecting while downloading
...
Previously if a disconnect occured while downloading a non recoverable error was displayed. This PR attempts to fix this by making sure `request_completed` signal is emitted with an `STATUS_CONNECTION_ERROR` response code.
(cherry picked from commit 70c39737db
2021-03-04 11:31:57 +01:00
1134fade46
Merge pull request #46373 from dalexeev/3.2-proposal-1545
...
[3.2] Merge Category and Property fields in the Project Settings
2021-03-04 10:19:12 +01:00
74bbdc9486
Merge pull request #46636 from Calinou/doc-itemlist-remove-examples-3.2
...
Remove incorrect/trivial examples in the ItemList class documentation
2021-03-04 08:56:02 +01:00
bd907d48ad
Remove incorrect/trivial examples in the ItemList class documentation
...
This closes https://github.com/godotengine/godot-docs/issues/4712 .
2021-03-03 22:56:02 +01:00
2c331b7900
Merge pull request #46618 from bruvzg/macos_export_entitlements
...
[macOS] Add entitlements config and export template `dylib` signing to the export.
2021-03-03 22:41:12 +01:00
c003423674
Merge pull request #46579 from nekomatata/fix-joint-remove-body-regression-3.2
...
[3.2] Fix Joint2D/Joint node path reset on scene switch
2021-03-03 16:41:59 +01:00
1c27d4a73d
[macOS] Add entitlements config and export template `dylib` signing to the export.
2021-03-03 12:40:44 +02:00
72e8697d8c
Merge Category and Property fields in the Project Settings
...
Closes godotengine/godot-proposals#1545 .
2021-03-02 19:39:46 +03:00
9fa85b343c
Merge pull request #46495 from asheraryam/fix-clip-content-error
...
Fix rounding error in Clip Content [3.2]
2021-03-02 17:07:06 +01:00
cdf0ebfac7
Fix Joint2D/Joint node path reset on scene switch
...
When one of the bodies exited the tree, the corresponding node path was
reset instead of just resetting the joint from the physics server. That
was causing the node path to be reset on scene switch when one of the
bodies is under the joint in the scene tree.
2021-03-02 08:32:00 -07:00
9ee835ac93
Merge pull request #46409 from asheraryam/fix-scale-pivot-jitter
...
Fix flicker in control nodes due to pivot offset
2021-03-02 16:15:21 +01:00
11ee43647b
Merge pull request #46590 from JFonS/fix_gridmap_lightmaps
...
[3.2] Properly disable dynamic lights on baked instances.
2021-03-02 15:05:29 +01:00
62f344f448
Properly disable dynamic lights on baked instances.
...
Automatically set the `baked_light` bool when applying a lightmap to an
instance. This ensures the disabling of dynamic lights when the
bake mode is set to ALL.
2021-03-02 14:49:01 +01:00
08898e97a4
Merge pull request #46587 from akien-mga/3.2-cherrypicks
...
Cherry-picks for the 3.2 branch (future 3.2.4) - 26th batch
2021-03-02 12:02:47 +01:00
9517b6e4ce
Check before connecting `TileMapEditor::settings_changed`
...
(cherry picked from commit 1e7662f972
2021-03-02 10:26:14 +01:00
d39e5b9987
Clarify Curve.get_closest_point uses baked points.
...
Based on the doc, I wasn't sure if get_closest_point would return the
closest baked point or the closest "source" point. It seems to use
baked:
8faecd6a47/scene/resources/curve.cpp (L809)ef5042a70f
2021-03-02 10:26:14 +01:00
3fe851accc
Added missing returns on error scenarios
...
(cherry picked from commit 3d9ef1e4de
2021-03-02 10:26:14 +01:00
28365a5258
Fix some grammar in StyleBoxFlat class docs
...
(cherry picked from commit 89e7e61773
2021-03-02 10:26:14 +01:00
29616f4a35
Fix parsing hexadecimal (lowercase `e`,`f`) in shaders
...
(cherry picked from commit 19e0a1ec9d
2021-03-02 10:26:14 +01:00
04fefed904
Logger: Cache 'flush_stdout_on_print' to improve performance, and works before ProjectSettings starts.
...
ProjectSetting: Now 'application/run/flush_stdout_on_print' requires a restart of the Editor to take effect
(cherry picked from commit 89283b7b53
2021-03-02 10:26:14 +01:00
279b9f43f3
Fix crash in GIProbe::bake
...
The problem happened when the passed from_node was null and the GIProbe
node had no parent node.
Fixes #45978
(cherry picked from commit 82fed7b6da
2021-03-02 10:26:14 +01:00
05367c755c
[Net] Better EOF handling in HTTPRequest.
...
This fix request_completed being emitted two times, the first with the
result, the second as a failure when retrieving responses served with
read-until-EOF.
(cherry picked from commit d61cd469f1
2021-03-02 10:26:14 +01:00
127f3c0566
Fixed bug that caused collision not to be properly reenabled when joint between two bodies is destroyed
...
(cherry picked from commit 519e314bea
2021-03-02 10:26:14 +01:00
2aafe2b25e
Add set_peer_timeout to NetworkedMultiplayerENet.
...
(cherry picked from commit 1b54de3039
2021-03-02 10:26:14 +01:00
56c0b39521
Don't check modified time if file doesn't exist
...
(cherry picked from commit af069109be
2021-03-02 10:26:14 +01:00
b2d723b039
Add generic support to PackedScene.Instance
...
(cherry picked from commit 3f50954ced
2021-03-02 10:26:14 +01:00
2d0dcd2e6c
Merge pull request #46576 from BastiaanOlij/fix_fbx_unique_bone_names
...
Fix duplicate check for bone names in FBX import
2021-03-02 09:11:12 +01:00
9c296bcb59
Fix duplicate check for bone names in FBX import
2021-03-02 10:55:29 +11:00
998ce22ea3
Merge pull request #46564 from pycbouh/graph-edit-hide-minimap-properly-3.2
...
[3.2] Properly hide GraphEdit's minimap
2021-03-01 17:54:40 +01:00
lawnjelly
Rémi Verschelde
Pop0p
janglee
Hugo Locurcio
Shane Liesegang
Pedro Rodrigues
kobewi
sps1112
kleonc
Michael Alexsander
Jordan Schidlowsky
Zak
bruvzg
Danil Alexeev
PouleyKetchoupp
JFonS
Yuri Roubinsky
Ryan Roden-Corrent
Ev1lbl0w
Andy Maloney
Mateo Kuruk Miccino
Fabio Alessandrelli
Eryk Dwornicki
Fabian
Aaron Franke
Bastiaan Olij