maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
29425 commits 10 branches 35 tags 1.1 GiB
Commit graph

29425 commits

This branch
This branch
All branches
Author SHA1 Message Date
Rémi Verschelde 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
bruvzg 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
Rémi Verschelde 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
Fabio Alessandrelli 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
Rémi Verschelde 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
Rémi Verschelde 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
Rémi Verschelde 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
Johannes 36bec6677e Move cursor shape loading after module loading 
fixes #46685

(cherry picked from commit 2ac9f37b17)
 2021-03-05 22:45:49 +01:00
PouleyKetchoupp 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
PouleyKetchoupp 6c0002afb5 Fix errors and crash with empty ConvexPolygonShape2D 
(cherry picked from commit 6fb6090748)
 2021-03-05 22:45:29 +01:00
Hugo Locurcio 48d5080e6a
Link to advanced exports tutorial in the Object class documentation 2021-03-05 22:44:41 +01:00
Rémi Verschelde b993febf28
Merge pull request #46697 from lawnjelly/camera_2d_delay_logic 
Fix Camera2D frame delay
 2021-03-05 20:09:43 +01:00
Fabio Alessandrelli 751a6f9a63 [HTML5] Rename heapCopy to heapSlice. 
New heapCopy function copies a TypedArray to the heap.
 2021-03-05 17:32:17 +01:00
Fabio Alessandrelli 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
Fabio Alessandrelli f64ec5f1ad [HTML5] Preloader fetch, streaming instantiation. 2021-03-05 17:32:17 +01:00
lawnjelly 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
lawnjelly 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
Rémi Verschelde 8a020a6573
Merge pull request #46662 from Calinou/doc-bakedlightmap-hdr 
Improve the BakedLightmap `use_hdr` documentation
 2021-03-05 15:14:33 +01:00
Rémi Verschelde 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
Rémi Verschelde 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
Pop0p 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
Rémi Verschelde 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
Rémi Verschelde 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
lawnjelly 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
janglee 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
Hugo Locurcio 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
Hugo Locurcio f3496529dd
Improve the BakedLightmap use_hdr documentation 
See https://github.com/godotengine/godot/issues/46442.
 2021-03-04 17:10:29 +01:00
Rémi Verschelde 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
Shane Liesegang 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
Pedro Rodrigues 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
kobewi b82d5688b9 Deselect column only if belongs to deselected item 
(cherry picked from commit 5cd5722f6a)
 2021-03-04 12:20:35 +01:00
sps1112 6ea1e97e06 Add null check for NavigationMesh.create_from_mesh() 
(cherry picked from commit cf6bfea93f)
 2021-03-04 11:41:46 +01:00
sps1112 216aba8228 Add size<=0 check in BakedLighmapData._get_user_data() 
(cherry picked from commit 18bb6e74be)
 2021-03-04 11:41:10 +01:00
Pedro Rodrigues 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
kleonc 5022103ee7 Make Color::from_hsv use Color::set_hsv 
(cherry picked from commit b59a06da25)
 2021-03-04 11:39:02 +01:00
Michael Alexsander 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
Jordan Schidlowsky 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
Zak 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
Rémi Verschelde 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
Rémi Verschelde 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
Hugo Locurcio 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
Rémi Verschelde 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
Rémi Verschelde 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
bruvzg 1c27d4a73d
[macOS] Add entitlements config and export template dylib signing to the export. 2021-03-03 12:40:44 +02:00
Danil Alexeev 72e8697d8c
Merge Category and Property fields in the Project Settings 
Closes godotengine/godot-proposals#1545.
 2021-03-02 19:39:46 +03:00
Rémi Verschelde 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
PouleyKetchoupp 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
Rémi Verschelde 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
Rémi Verschelde 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
JFonS 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