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

29932 commits

This branch
This branch
All branches
Author SHA1 Message Date
Rémi Verschelde
594764c2ec
Revert "make 2d constraint solving more deterministic by solving in push order" 
This reverts commit 266314ba26.

There seems to be some performance concerns, so reverting the cherry-pick for
now and we'll revisit later (see https://github.com/godotengine/godot/pull/44112#issuecomment-829426790).
 2021-04-29 19:12:19 +02:00
Rémi Verschelde
780188a7b3
Merge pull request #48301 from akien-mga/3.x-scons-thirdparty-lib-depends 
[3.x] SCons: Add explicit dependencies on thirdparty code in cloned env
 2021-04-29 17:20:11 +02:00
Rémi Verschelde
e94161dada
SCons: Add explicit dependencies on thirdparty code in cloned env 
Since we clone the environments to build thirdparty code, we don't get an
explicit dependency on the build objects produced by that environment.

So when we update thirdparty code, Godot code using it is not necessarily
rebuilt (I think it is for changed headers, but not for changed .c/.cpp files),
which can lead to an invalid compilation output (linking old Godot .o files
with a newer, potentially ABI breaking version of thirdparty code).

This was only seen as really problematic with bullet updates (leading to
crashes when rebuilding Godot after a bullet update without cleaning .o files),
but it's safer to fix it everywhere, even if it's a LOT of hacky boilerplate.

(cherry picked from commit c7b53c03ae)
 2021-04-29 16:57:00 +02:00
Rémi Verschelde
0c14d10522
Merge pull request #48296 from akien-mga/3.x-cherrypicks 2021-04-29 13:48:49 +02:00
Rémi Verschelde
e20b8b00d5
Merge pull request #48273 from Calinou/doc-spatialmaterial-rim-unshaded 
Document that clearcoat/rim lighting is not visible on unshaded materials (3.x)
 2021-04-29 13:36:47 +02:00
Rémi Verschelde
f94e76644a
Merge pull request #47938 from smix8/doc_skeletonik_3x 
[3.x] Document SkeletonIK
 2021-04-29 13:34:16 +02:00
Rémi Verschelde
606073db06
Merge pull request #47173 from LightningAA/graphedit-zoom-cherrypicks 2021-04-29 13:33:17 +02:00
Rémi Verschelde
d252ef4c5e
Merge pull request #46527 from kuruk-mm/3_2_lineedit 2021-04-29 13:32:33 +02:00
Rémi Verschelde
880b830ca8
Merge pull request #46292 from hilfazer/nested_scene_instances_duplication 2021-04-29 13:31:27 +02:00
Rémi Verschelde
188147e82c
Merge pull request #48259 from akien-mga/scenetree-global_menu_action-types 
SceneTree: Fix type hints for `global_menu_action` signal
 2021-04-29 13:27:32 +02:00
Rémi Verschelde
70ae90e0e8
Core: Drop custom copymem/zeromem defines 
We've been using standard C library functions `memcpy`/`memset` for these since
2016 with 67f65f6639.

There was still the possibility for third-party platform ports to override the
definitions with a custom header, but this doesn't seem useful anymore.

Backport of #48239.
 2021-04-29 12:34:11 +02:00
David Snopek
1db31d0afa
Fixes #48178: WebXR broken when built with Emscripten 2.0.13 or later 
(cherry picked from commit b77925d246)
 2021-04-29 12:30:36 +02:00
Rémi Verschelde
d54c13ac1a
Tabs: Remove unused 'panel' stylebox from default theme 
Cf. https://github.com/godotengine/godot/issues/37875#issuecomment-625297308.

(cherry picked from commit cd8d321961)
 2021-04-29 12:30:10 +02:00
Johannes Witt
41a016c1e8
Fix CSG Path Polygon cache being removed after connect 
fixes #30229

(cherry picked from commit bab36f1273)
 2021-04-29 12:29:28 +02:00
Rémi Verschelde
1489b814aa
Android: Upgrade buildTools from 30.0.1 to 30.0.3 
It seems 30.0.1 had issues with compatibility with JDK 8 and 11,
which appear to be solved in 30.0.3 as per godotengine/godot-docs#4796.

(cherry picked from commit d88e1f04df)
 2021-04-29 12:28:51 +02:00
Fabio Alessandrelli
bfe182f221
[Net] Fix socket poll timeout on Windows. 
Now correctly computes the timeout value in milliseconds.

(cherry picked from commit 46f7b0f74b)
 2021-04-29 12:28:31 +02:00
Lightning_A
e4addffde1
Put physics override parameters in their own group and document that areas can be used to influence audio 
(cherry picked from commit 80b1a29c46)
 2021-04-29 12:27:31 +02:00
Aaron Franke
d304187357
Warn when creating a script with the same name as the parent class 
(cherry picked from commit 5a9037f828)
 2021-04-29 12:23:33 +02:00
Michael Alexsander
917630107c
Select non-perfect matches if necessary in the Search Help dialog 
(cherry picked from commit 77597ea47c)
 2021-04-29 11:41:51 +02:00
Michael Alexsander
b406e904ec
Fix EditorInspector not updating its theme on rare occasions 
(cherry picked from commit efa3927b49)
 2021-04-29 11:40:13 +02:00
floppyhammer
4628ab2a15
ImproveCompletionPanelPositionInShaderEditor 
(cherry picked from commit e927a9fef0)
 2021-04-29 11:35:52 +02:00
David Hoppenbrouwers
224fce946b
Fix joint RID not being passed to _set in PhysicalBone 
Also remove default RID() argument from JointData._set()

(cherry picked from commit 41e00b6787)
 2021-04-29 11:30:17 +02:00
univeous
43d3eca5e9
allow input echo when changing ui focus 
(cherry picked from commit f5b506763e)
 2021-04-29 11:27:56 +02:00
lupoDharkael
a5842a8362
Save resource: implement extension priority 
give .res less priority and .tres more priority as preferred
extensions.

(cherry picked from commit f2e906496b)
 2021-04-29 11:27:56 +02:00
Jordan Schidlowsky
266314ba26
make 2d constraint solving more deterministic by solving in push order 
(cherry picked from commit 043b6c2d93)
 2021-04-29 11:27:56 +02:00
Lyuma
11b8b8ad27
Allow renaming bones and blendshapes. 
(cherry picked from commit d13568a8d1)
 2021-04-29 11:27:56 +02:00
Pasi Nuutinmaki
f8c4ffcdde
Fix area calculation of Face3 
There seemed to be a bug in area calculation in Face3::get_area()-function. It returned the area of "imaginary" parallelogram instead of the triangle. Therefore the area returned was twice the real area. This manifested itself when using a hydro module for godot ( https://gitlab.com/ringtechsolutions/godot-tools/hydro/hydro ) causing the buoyancy to be two times the expected value.

"Reference": http://www.maths.usyd.edu.au/u/MOW/vectors/vectors-11/v-11-7.html

(cherry picked from commit a165eed73b)
 2021-04-29 11:10:50 +02:00
skyace65
c05ff94b84
Improve SpriteFrames get_animation_loop description 
(cherry picked from commit d311c48d6a)
 2021-04-29 11:09:20 +02:00
Rémi Verschelde
0469698b5f
Merge pull request #48270 from akien-mga/3.x-deprecate-largetexture 
doc: Mark LargeTexture as deprecated (removed in 4.0)
 2021-04-29 09:45:20 +02:00
thebestnom
0477256793 [Android] fix generateDevTemplate 2021-04-28 22:00:25 +03:00
thebestnom
fd7141fc03 [Android] Allow to build dev template with symbols 2021-04-28 22:00:25 +03:00
Rémi Verschelde
25b170599b
Merge pull request #47129 from mortarroad/3.x-fix-directional-light-order 
Fix draw order of transparent materials with multiple directional lights
 2021-04-28 19:03:37 +02:00
Hugo Locurcio
8df0e61cc2
Document that clearcoat/rim lighting is not visible on unshaded materials 2021-04-28 17:40:14 +02:00
Rémi Verschelde
31581ca429
Merge pull request #46687 from QbieShay/fix-particle-rotate-y 2021-04-28 17:08:44 +02:00
Rémi Verschelde
135fd8ff8c
Merge pull request #34008 from ricmzn/fix-viewport-texture-flags 
GLES3: Allow repeat flag in viewport textures
 2021-04-28 17:04:47 +02:00
Rémi Verschelde
e9efc349ac
Merge pull request #47582 from clayjohn/GLES3-fix-multimesh-modulate 
Fix multimesh being colored by other nodes GLES3
 2021-04-28 17:02:00 +02:00
Rémi Verschelde
8ec14c917f
Merge pull request #47469 from HEAVYPOLY/ios-pen-pressure 
Add iOS pen pressure
 2021-04-28 17:01:05 +02:00
Rémi Verschelde
a706fb11e5
Merge pull request #47943 from nekomatata/joint-check-body-types-3.x 
[3.x] Fix errors related to joints setup with two non-dynamic bodies
 2021-04-28 16:58:23 +02:00
Rémi Verschelde
3ded745305
Merge pull request #47887 from Pineapple/separate-set-3x 
[3.x] Separate set.h from map.h
 2021-04-28 16:58:09 +02:00
Rémi Verschelde
f85d59c97f
Merge pull request #47349 from nekomatata/heightmap-support-3.x 
[3.x] Heightmap collision shape support in Godot Physics
 2021-04-28 16:57:29 +02:00
Rémi Verschelde
80619a00d7
Merge pull request #47979 from HenryWConklin/3.x-optimize-hashgrid-layers 
Optimize BroadPhase2dHashGrid to not pair elements on different layers
 2021-04-28 16:57:19 +02:00
Rémi Verschelde
3edf1adf91
Merge pull request #38348 from asheraryam/convex-decompose 
[3.x] Create GDScript bindings for creating multiple-convex collision bodies
 2021-04-28 16:48:59 +02:00
Rémi Verschelde
cdc94387c8
Merge pull request #48154 from ttencate/patch-1 
Add OpenSimplexNoise output change to changelog
 2021-04-28 16:45:52 +02:00
Rémi Verschelde
581afc76df
Merge pull request #48250 from Faless/js/3.x_pwa_final 2021-04-28 16:41:16 +02:00
Rémi Verschelde
562c6bd9ab
doc: Mark LargeTexture as deprecated (removed in 4.0) 
Cf. https://github.com/godotengine/godot/pull/48269.
 2021-04-28 16:21:43 +02:00
Rémi Verschelde
6cb61b67e6
Merge pull request #41471 from Calinou/giprobe-deprecate-compress-3.2 2021-04-28 12:01:55 +02:00
Rémi Verschelde
2b90e92adb
Merge pull request #48263 from akien-mga/3.x-ci-emscripten-2.0.15 2021-04-28 11:52:16 +02:00
Rémi Verschelde
9571ae3a33
CI: Upgrade Emscripten to 2.0.15 (same as official standard builds) 
We still use Emscripten 1.39.9 for official Mono builds so ideally we want to test
against an old Emscripten version to ensure we don't break compatibility.

But then google-closure-compiler-linux broke compatibility for us and is not properly
pinned, so we need to use a more recent version for now to fix CI.

Cf. https://github.com/emscripten-core/emsdk/issues/802
 2021-04-28 10:59:57 +02:00
Rémi Verschelde
6ba10c6c1f
SceneTree: Fix type hints for global_menu_action signal 
Fixes https://github.com/godotengine/godot-headers/issues/89.
 2021-04-28 09:40:59 +02:00
Rémi Verschelde
94235fad03
Merge pull request #48246 from madmiraal/fix-24111-3.x 
[3.x] Update CSGMesh's documentation to explain how vertex normals are used
 2021-04-27 23:05:11 +02:00