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
Dominik 'dreamsComeTrue' Jasiński
51a1a27457
Hide editor_spin_slider grabber when closing Editor's windows
...
Fixes : #38740
(cherry picked from commit 095167dcc3
)
2020-05-16 00:08:37 +02:00
Thakee Nathees
9ee77179b5
break, continue outside of a loop, match statement handled
...
(cherry picked from commit c076a2b7e9
)
2020-05-16 00:08:37 +02:00
Rémi Verschelde
000899647a
Merge pull request #38767 from ofrank123/bug/lsp-save-error
...
[3.2.2] Fix incorrect initialize notification in language server
2020-05-15 23:55:07 +02:00
Oliver Frank
2173d041af
Fix incorrect capabilities notification in LSP
2020-05-15 16:43:48 -04:00
Oliver Frank
dac8b7b6f4
Improve jsonrpc error reporting
2020-05-15 16:42:24 -04:00
Rémi Verschelde
0556a48bf9
Merge pull request #38752 from Calinou/rename-error-warning-icon
...
Rename the ErrorWarning icon file to match the 3.2 naming scheme
2020-05-15 18:03:05 +02:00
Rémi Verschelde
c7c608166d
Merge pull request #38749 from akien-mga/3.2-android-modules-GodotPaymentV3
...
Android: Check for use of deprecated GodotPaymentV3 module, direct to new plugin
2020-05-15 18:02:39 +02:00
Hugo Locurcio
fa279d02f7
Rename the ErrorWarning icon file to match the 3.2 naming scheme
2020-05-15 14:16:46 +02:00
Rémi Verschelde
d45b96d2b1
Android: Check for deprecated GodotPaymentV3 module, direct to new plugin
...
Fixes #38581 .
2020-05-15 13:32:30 +02:00
Thakee Nathees
d13f46bc41
shadowed var warning in nested block bug fix
...
Fix : #38552
(cherry picked from commit 79eee93b9a
)
2020-05-14 22:01:45 +02:00
Thakee Nathees
40c43da96f
set parser error when infer type is null
...
(cherry picked from commit 687b1941b4
)
2020-05-14 22:01:26 +02:00
Rémi Verschelde
f5a3d34593
Merge pull request #38734 from lawnjelly/polyline_bug
...
GLES2 polyline drawn as GL_LINE_STRIP to match GLES3
2020-05-14 20:25:19 +02:00
lawnjelly
8005175ea5
GLES2 polyline drawn as GL_LINE_STRIP to match GLES3
...
The behaviour of TYPE_POLYLINE appeared incorrect in GLES2, and inconsistent with GLES3 and the docs, which state that draw_polyline 'Draws interconnected line segments'. Also when drawing with triangles GLES2 draws interconnected segments.
This PR simply changes the primitive from GL_LINES to GL_LINE_STRIP as in GLES3.
2020-05-14 10:38:12 +01:00
Thakee Nathees
e42318e41c
regression: var declaration type info parser bug fix
...
(cherry picked from commit e5d735851d
)
2020-05-13 16:14:22 +02:00
Thakee Nathees
6d7fb3d322
regression: static func can't access const fix
...
(cherry picked from commit e7f056dfac
)
2020-05-13 16:14:08 +02:00
Marcel Admiraal
dd7f9b1c08
Make it clear that PhysicsDirectSpaceState is only available from
...
within _physics_process().
(cherry picked from commit bb9c104695
)
2020-05-13 16:13:47 +02:00
Marcel Admiraal
253d211102
Silence EQ::Band::c1, c2 and c3 may be used uninitialized warnings.
...
(cherry picked from commit d02143905f
)
2020-05-13 16:12:37 +02:00
Hugo Locurcio
e22cff8ccf
Update the editor icons README to remove outdated information
...
This closes #38684 .
(cherry picked from commit c6afb9f6ea
)
2020-05-13 16:12:22 +02:00
Hugo Locurcio
6692681618
Tweak the error message displayd when a post-import script fails
...
See #38662 .
(cherry picked from commit 0d7b627936
)
2020-05-13 16:12:03 +02:00
Ashesh3
40d8ed023c
Better file naming for AppVeyor artifacts
...
This builds upon https://github.com/godotengine/godot/pull/38625 and improves the file name format as mentioned in https://github.com/godotengine/godot/pull/38189#issuecomment-626585363
The resulting file stored has the name `godot.windows.opt.tools.64-$(VERSION_HASH).zip` where `VERSION_HASH` is obtained from `it rev-parse --short=9 HEAD` , the zip file contains the built exe file.
(cherry picked from commit 4f055c93a5
)
2020-05-13 16:11:30 +02:00
etienne.frank
46327d48a2
Fix minimap selection offset
...
The minimap selection was shifted of 1 line too late.
(cherry picked from commit 72ab355945
)
2020-05-13 16:10:12 +02:00
Hugo Locurcio
0b6bcf90f5
Rename the editor action "Revert Scene" to "Reload Saved Scene"
...
This option can be used to workaround various issues with stuff
not reloading properly when changes are made.
The option was renamed to clarify the fact that it actually
reloads the scene saved on the filesystem.
(cherry picked from commit 2962819d1c
)
2020-05-13 16:09:38 +02:00
Thakee Nathees
72aa9ce7fc
range() with non-numeric const argument crash fix
...
(cherry picked from commit 3e10392d48
)
2020-05-13 16:08:33 +02:00
Rémi Verschelde
ee7bde231c
Merge pull request #38706 from nathanfranke/fix-rename-sizing
...
Fix rename dialog size in 3.2
2020-05-13 07:19:34 +02:00
Rémi Verschelde
b7ce9ad1bf
Merge pull request #38694 from lawnjelly/kessel_builtins
...
GLES2 Batching - Prevent baking colors with COLOR writes
2020-05-13 07:12:38 +02:00
nathanwfranke
814f72c524
Fix rename dialog size in 3.2
2020-05-12 18:34:00 -05:00
Author Lawnjelly
94ed206bfc
GLES2 Batching - Prevent baking colors with COLOR writes
...
Writing to COLOR in a custom shader can result in incorrect results if colors are baked (vertex color and modulate). This PR prevents baking with COLOR output, except under the special circumstances that final modulate is (1, 1, 1, 1), in which case the result will be correct. This should still allow color baking in many scenarios with custom shaders.
2020-05-12 14:04:53 +01:00
Rémi Verschelde
8cb67bb359
Merge pull request #38692 from Calinou/doc-projectsettings-ssl-certificates
...
Clarify that the SSL certificate setting overrides the default bundle
2020-05-12 12:55:19 +02:00
Hugo Locurcio
47d003fbb8
Clarify that the SSL certificate setting overrides the default bundle
...
See https://github.com/godotengine/godot-docs/issues/2531 .
2020-05-12 11:52:57 +02:00
Rémi Verschelde
d999e1519c
Merge pull request #38686 from Calinou/doc-tilemap-used-cells-by-index
...
Clarify the `id` parameter in `TileMap.get_used_cells_by_id()`
2020-05-12 09:45:36 +02:00