Rémi Verschelde
7ccb146a55
Merge pull request #38979 from lawnjelly/kessel_unshaded_bug
...
GLES2 Batching - Builtins prevent baking in unshaded shaders
2020-05-23 13:58:12 +02:00
lawnjelly
b95add2bfd
GLES2 Batching - Builtins prevent baking in unshaded shaders
...
Builtins that should prevent baking colors and vertex positions were incorrectly only active in shaders that were not unshaded. This was a terminology misunderstanding - unshaded materials can still use shaders so should have the same test to prevent baking.
2020-05-23 11:35:33 +01:00
Rémi Verschelde
73b97e8f05
Merge pull request #38963 from neikeq/scons-option-build-cil
...
[3.2] Add SCons option to not build C# solutions
2020-05-22 18:29:52 +02:00
Rémi Verschelde
d5e380117f
Merge pull request #38952 from bruvzg/win_ink_block_mm_3
...
[3.2] Block WM_MOUSEMOVE during Windows Ink pen handling.
2020-05-22 14:34:29 +02:00
bruvzg
28aabf4f73
[3.2] Block WM_MOUSEMOVE during Windows Ink pen handling.
2020-05-22 14:05:53 +03:00
Rémi Verschelde
fa9c44bf65
Merge pull request #38890 from Xrayez/save-png-buffer-3.2
...
[3.2] Add `Image.save_png_to_buffer` method
2020-05-22 09:48:50 +02:00
Ignacio Etcheverry
ce09d0c5e1
Add SCons option to not build C# solutions
2020-05-22 03:12:54 +02:00
Rémi Verschelde
8cf450c16b
Merge pull request #38916 from madmiraal/appveyor-test
...
[3.2] Enable Appveyor error on warnings.
2020-05-21 14:27:04 +02:00
Marcel Admiraal
aeb1181add
Enable Appveyor error on warnings.
2020-05-21 11:28:01 +01:00
Marcel Admiraal
dac3504cc3
Fix C4724: potential mod by 0 warnings.
2020-05-21 11:28:01 +01:00
Andrii Doroshenko (Xrayez)
a3cad44f44
Add Image.save_png_to_buffer
method
...
Backported from da0457fa29
.
This commit additionally exposes the method to scripting (4.0).
2020-05-20 15:38:20 +03:00
Rémi Verschelde
b6c551e864
Merge pull request #38875 from bruvzg/tab_drv_sel_32
...
[Windows, 3.2] Add tablet driver selection.
2020-05-20 13:58:26 +02:00
Rémi Verschelde
c5bb283ede
Merge pull request #38832 from akien-mga/3.2-cherrypicks
...
Cherry-picks for the 3.2 branch (future 3.2.2) - 6th batch
2020-05-20 13:58:08 +02:00
Hugo Locurcio
a785641196
Allow .res
and .tres
extensions in the scene CLI positional argument
...
This closes #35709 .
(cherry picked from commit 653334cc8d
)
2020-05-20 12:07:08 +02:00
SkyJJ
2197ef0566
Fix Android LineEdit editing bugs
...
(cherry picked from commit cc473b948f
)
2020-05-20 12:07:08 +02:00
Michael Alexsander
3d8cc49ec5
Keep "lock" metadata when changing a Node's type, if applicable
...
(cherry picked from commit d015e4d6fc
)
2020-05-20 11:43:49 +02:00
Ignacio Etcheverry
6dfd80673a
Mono/C#: Remove script load error about not a Godot.Object
...
Any C# file can be loaded as script and at load
time we don't yet know if it's actually meant to
be used as a script. As such, such an check can
result in a lot of false errors.
If the file is really meant to be used as a
script, an error would be printed later when
attempting to instantiate it any way.
(cherry picked from commit 38cd2152e6
)
2020-05-20 11:41:01 +02:00
Pedro J. Estébanez
8f90d423b9
Fix too eager GDScriptFunctionState stack cleanup
...
(cherry picked from commit 1f0548efd4
)
2020-05-20 11:40:45 +02:00
bruvzg
e3be0520a1
[Windows] Add quotes only to the command line arguments with special characters.
...
(cherry picked from commit cac399a829
)
2020-05-20 11:39:55 +02:00
Fredia Huya-Kouadio
2c81a82d53
Update the permission string for the Oculus hand tracking to match the latest api update
...
(cherry picked from commit 6e2988f26a
)
2020-05-20 11:37:24 +02:00
Andrea Catania
b0ba122443
Removed const from OAHashMap iterator value
...
to allows to mutate the value while iterating over it.
(cherry picked from commit 97f9bbcfa3
)
2020-05-20 11:35:28 +02:00
bruvzg
9669c437ef
macOS signing improvements: allow signed app exporting as ZIP, sign DMG after exporting.
...
(cherry picked from commit 4bec713b8c
)
2020-05-20 11:33:57 +02:00
Marcel Admiraal
a520e03730
Update .appveyor.yml.
...
- Set options to be the same as travis builds,
except use warnings=all instead of warnings=extra.
- Fail on warnings as per travis builds.
(cherry picked from commit 106221a733
)
Edited to set `werror=no` until we've fixed all warnings.
2020-05-20 11:30:43 +02:00
bruvzg
71b2abbfa3
[Windows, 3.2] Add tablet driver selection.
2020-05-20 09:36:56 +03:00
Rémi Verschelde
f390749439
Fix Visual Studio C4724 warning (potential mod by 0)
2020-05-19 11:09:28 +02:00
Rémi Verschelde
e6a3499bef
Fix Visual Studio C4334 warning
2020-05-19 10:19:52 +02:00
Eric Rybicki
c2eea4bde0
Fix certain characters being recognized as special keys in Windows when using the us international layout
...
(cherry picked from commit e460456e60
)
2020-05-19 10:19:52 +02:00
Pedro J. Estébanez
75f6d2ef32
Remove no longer needed patches to jpgd.cpp
...
(cherry picked from commit abe03ff1f0
)
2020-05-19 10:19:52 +02:00
Rémi Verschelde
dcb68e0106
SCons: Improve registration of compilation_db tool, check version
...
There's a builtin `toolpath` option we can use for that, so no need to hack
around a custom `scons_site` path.
The script requires SCons 3.1.1 or later, so we enable it conditionally.
Follow-up to #32848 .
(cherry picked from commit 22c718ab17
)
2020-05-18 16:40:33 +02:00
RevoluPowered
9aa4648579
Added compilation database support for clang and gcc
...
This tool is originally from mongodb.
- Updated CPPSUFFIXES to use scons suffixes
- objective-c files will also be loaded into the compilation database where the compiler / tooling is available to compile the files.
Known limitations:
- This will not work with msvc as your compiler.
(cherry picked from commit 5a6f275b74
)
2020-05-18 16:40:33 +02:00
Andrii Doroshenko (Xrayez)
35d95918ae
Add custom.py
to .gitignore
...
The default `custom.py` can be created at the root of the Godot
repository to initialize any SCons build options via file which are
specific to user.
(cherry picked from commit a712e14038
)
2020-05-18 16:40:33 +02:00
Hugo Locurcio
8ebcdeb3d7
Document that Dictionary is always passed as reference
...
See #38792 .
(cherry picked from commit 675fea1648
)
2020-05-18 16:40:33 +02:00
Marcus Brummer
4779d289d5
Fixed text editor drawing if smooth scrolling is disabled.
...
Fixes #38778
(cherry picked from commit b048eb05ad
)
2020-05-18 16:40:33 +02:00
smartin015
8cab02ec06
Remove get_local_mouse_position() hack in GraphEdit
...
(cherry picked from commit 00457c68bc
)
2020-05-18 16:40:33 +02:00
Eduardo Nunes Pereira
05cd3ff8ba
Using command + comma on macOS as default shortcut for editor settings
...
(cherry picked from commit 75f77f751e
)
2020-05-18 16:40:33 +02:00
Fabio Alessandrelli
92031098bf
Move mixrate and latency definition to AudioServer
...
Each driver used to define the (same) project settings value, but the
setting names are not driver specific. Ovverriding is still possible via
platform tags.
(cherry picked from commit 90c7102b51
)
2020-05-18 16:40:33 +02:00
Fabio Alessandrelli
6d1ddf7eb1
AudioDriverJavaScript now compute buffer size.
...
Based on mix rate and expected latency.
(cherry picked from commit 245c179bd3
)
2020-05-18 16:40:33 +02:00
Rémi Verschelde
8e91d2746d
Merge pull request #38828 from RandomShaper/fix_oa_hash_map_3.2
...
Fix leaks and crashes in OAHashMap (3.2)
2020-05-18 15:04:31 +02:00
Pedro J. Estébanez
8349635ffc
Fix leaks and crashes in OAHashMap
...
This changes the way the lifespan of items is managed to be consistent.
Bonus: Simplify cases of destroy-then-emplace.
2020-05-18 14:02:49 +02:00
Rémi Verschelde
154e2ff234
Merge pull request #38824 from m4gr3d/hide_custom_defines_from_editor
...
Remove the `custom_defines` section from the editor
2020-05-18 11:50:53 +02:00
Fredia Huya-Kouadio
4db8ade565
Remove the custom_defines
section from the editor
2020-05-18 01:07:38 -07:00
Rémi Verschelde
43bf8e27b6
Merge pull request #38799 from bruvzg/gdnative_size_fix_3
...
[3.2] Fix GDNative Variant type size, add size checks.
2020-05-18 10:02:08 +02:00
Max Hilbrunner
ebc63dac30
Merge pull request #38784 from remram44/patch-1
...
[DOC] Update description of Object.free() method
2020-05-17 20:33:57 +02:00
bruvzg
d255cc9e4d
Fix GDNative Variant type size on 32-bit platforms, add size checking static asserts. [3.2]
2020-05-17 16:11:49 +03:00
Rémi Verschelde
a2f32c970d
Merge pull request #38175 from m4gr3d/improve_android_plugin_config
...
[3.2] Implementation of the Godot Android Plugin configuration file
2020-05-17 11:07:19 +02:00
Fredia Huya-Kouadio
a71a338c59
Implementation of the Godot Android Plugin configuration file
2020-05-16 23:09:45 -07:00
Rémi Verschelde
21180675c9
Merge pull request #38774 from pepegadeveloper123/mono_inherited_scene_bug_3.2
...
Mono inherited scene bug 3.2
2020-05-16 18:49:35 +02:00
Remi Rampin
ccf5703568
Update description of Object.free() method
...
Clarify that variables pointing to an object don't become `null` when that object is freed, it just makes them invalid.
2020-05-16 12:32:41 -04:00
pepegadeveloper123
23d51ac325
Fix inherited C# scene not inheriting parent's fields (3.2)
...
When a child scene inherits a parent scene with a C# root node, the
parent scene's export variables appear to assume values set in the
parent scene, in the child scene's Inspector. However, when the child
scene is played, the parent scene's export variables assume default
values.
When a node is created, it inherits its parent C# script's fields from
the map CSharpScriptInstance::script->member_info. However this map was
not initialized outside the editor, and this commit ensured it is. This
fixes issues #36480 and #37581 .
This is a manual backport of PR #38638 for 3.2.
2020-05-16 11:18:58 +02:00
Rémi Verschelde
d784cb23ec
Merge pull request #37929 from thebestnom/migrate-to-androidX-3.2
...
Android: Migrate deprecated support library to AndroidX [3.2]
2020-05-16 09:03:44 +02:00