118567ca28
Merge pull request #46657 from lawnjelly/revert_snapping
...
Revert backport of 2D transform and camera snapping options
2021-03-08 14:49:41 +01:00
3fafaf2cf2
Merge pull request #46717 from lawnjelly/camera_process
...
Improve process logic in Camera2D
2021-03-08 14:42:08 +01:00
8763d891fe
Improve process logic in Camera2D
...
The logic for internal process and internal physics process in Camera2D was very buggy and convoluted for historical reasons.
This is a cleanup to make the logic simpler and easier to follow.
2021-03-08 13:29:19 +00:00
6b48fce2b5
SCons: Fix parsing PATH when constructing base environment
...
We constructed the SCons environment without taking any (shell) environment
variables into account, and then appended a few, but too late. This would
cause variables like `env[CXX]` not to be properly expanded to respect a
non-standard `PATH`.
With this fix, setting:
```
PATH=$GODOT_SDK/bin:$PATH
```
will now properly use `$GODOT_SDK/bin/gcc` if available over `/usr/bin/gcc`.
(cherry picked from commit 5d217a9441
2021-03-07 22:51:33 +01:00
8be3995efa
Fix crash on cleanup of EditorFileServer
...
(cherry picked from commit 565796518d
2021-03-07 22:51:06 +01:00
2e9c6a5129
Link to Godot Contributors Chat instead of IRC
...
(cherry picked from commit 848f3bba7c
2021-03-07 22:51:06 +01:00
bc56681b0b
Don't save unchanged script upon closing
...
(cherry picked from commit 12f5a5a701
2021-03-07 22:51:06 +01:00
aabb8d78ef
Added some checks to prevent accessing a null collider
...
Previously godot would try to access
`CollisionObjectBullet::bt_collision_object` even if it was null.
Fixes #46651
(cherry picked from commit c47070e165
2021-03-07 22:51:06 +01:00
749892c9fc
Release mouse when SpinBox leaves scene tree
...
(cherry picked from commit 83f6c6b360
2021-03-07 22:51:06 +01:00
81fd486c92
Merge pull request #46770 from aaronfranke/3.2-sign-doc
...
[3.2] Fix documentation for Vector2/3.sign()
2021-03-07 21:48:14 +01:00
a320d28f53
[3.2] Fix documentation for Vector2/3.sign()
2021-03-07 15:34:57 -05:00
eca079c198
Merge pull request #46763 from Calinou/interepolatedcamera-remove-deprecation-warning
...
Remove deprecation warning messages from InterpolatedCamera
2021-03-07 16:39:40 +01:00
ac6251d8b2
Remove deprecation warning messages from InterpolatedCamera
...
Since Godot 4.0's relea se is still a while away, warning users
every time the project starts might be a bit too dramatic.
2021-03-07 15:56:41 +01:00
3d5f964a49
Merge pull request #46755 from Calinou/tweak-shader-error-gles3-only
...
Tweak shader errors for features only usable in GLES3
2021-03-07 13:41:03 +01:00
0c6873b13e
Tweak shader errors for features only usable in GLES3
...
See https://github.com/godotengine/godot/issues/42719#issuecomment-792168504 .
2021-03-07 13:27:13 +01:00
2390b98775
Merge pull request #46749 from bruvzg/thread_id_fix_3
...
[3.2] Improve thread IDs to avoid collisions with threads not created by the Godot API.
2021-03-07 10:07:58 +01:00
ce11f7fa3e
[3.2] Improve thread IDs to avoid collisions with threads not created by the Godot API.
2021-03-07 10:09:02 +02:00
82fcd3a7b8
Merge pull request #46731 from Faless/js/3.x_fetch_world
...
[3.2][HTML5] Replace XMLHttpRequest(s) with Fetch.
2021-03-06 16:15:39 +01:00
c01f35de12
[HTML5] Replace XMLHttpRequest with Fetch.
...
This has some advantages:
- Streaming/chunked response support.
- Broader headers support.
2021-03-06 11:44:43 +01:00
f477d3ca98
Merge pull request #46711 from akien-mga/3.2-mono-c++14-compat
...
Mono: Don't use C++17 [[maybe_unused]] to preserve C++14 compatibility
2021-03-06 09:35:49 +01:00
fcc36d9731
Merge pull request #46707 from Calinou/doc-object-get-property-list-tutorial
...
Link to advanced exports tutorial in the Object class documentation
2021-03-06 00:05:16 +01:00
558d524bcb
Mono: Don't use C++17 [[maybe_unused]] to preserve C++14 compatibility
...
The 3.2 branch compiles against the C++14 standard to keep good compatibility
with somewhat older compilers.
Fixes #45839 .
2021-03-05 23:28:09 +01:00
36bec6677e
Move cursor shape loading after module loading
...
fixes #46685
(cherry picked from commit 2ac9f37b17
2021-03-05 22:45:49 +01:00
17bb7c6735
Fix errors with invalid CollisionPolygon2D
...
Fixed internal errors when the shape is invalid and made warnings more
descriptive.
(cherry picked from commit 2217e477b9
2021-03-05 22:45:29 +01:00
6c0002afb5
Fix errors and crash with empty ConvexPolygonShape2D
...
(cherry picked from commit 6fb6090748
2021-03-05 22:45:29 +01:00
48d5080e6a
Link to advanced exports tutorial in the Object class documentation
2021-03-05 22:44:41 +01:00
b993febf28
Merge pull request #46697 from lawnjelly/camera_2d_delay_logic
...
Fix Camera2D frame delay
2021-03-05 20:09:43 +01:00
751a6f9a63
[HTML5] Rename heapCopy to heapSlice.
...
New heapCopy function copies a TypedArray to the heap.
2021-03-05 17:32:17 +01:00
41c64533b0
[HTML5] Export process writes sizes in template.
...
This allow the loading bar to be much more reliable, even in cases where
realible stream loading status is not detectable (server-side
compression, chunked encoding).
2021-03-05 17:32:17 +01:00
f64ec5f1ad
[HTML5] Preloader fetch, streaming instantiation.
2021-03-05 17:32:17 +01:00
136f94fa24
Fix Camera2D frame delay
...
Fixes camera frame delay by always doing a scroll update except when smoothing is active.
2021-03-05 15:46:26 +00:00
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
Rémi Verschelde
lawnjelly
Rémi Verschelde
Pedro J. Estébanez
kobewi
Duddino
Aaron Franke
Hugo Locurcio
bruvzg
Fabio Alessandrelli
Johannes
PouleyKetchoupp
Pop0p
janglee
Shane Liesegang
Pedro Rodrigues
sps1112
kleonc