Commit Graph

28247 Commits

Author SHA1 Message Date
Rémi Verschelde
0b38c50311
SCons: Do not define TYPED_METHOD_BIND on Linux/OSX with clang
Port of #43862.
2020-11-25 21:17:48 +01:00
Rémi Verschelde
83f7c2d957
Merge pull request #43818 from lawnjelly/back_buffer_fix
Batching - BackBuffer copy fix
2020-11-25 08:26:20 +01:00
lawnjelly
7c4cf1c043 Batching - BackBuffer copy fix
For fixing a previous issue state.canvas_texscreen_used was reset to false at the start of each render_joined_item. This was causing a later shader that used SCREEN_TEXTURE to force recapturing the back buffer immediately prior to use, which we don't want.

This PR preserves the state across joined items, and also prevents joining of items that copy the back buffer as this may be problematic.

It turns out that the original issue that needed the line is now fixed, and the later issue is also fixed by removing it.
2020-11-24 14:59:15 +00:00
Rémi Verschelde
5a66e66448
Merge pull request #43776 from lawnjelly/ewok_asserts3
2d Legacy - close vulnerabilities and more debug checks
2020-11-24 09:14:17 +01:00
Rémi Verschelde
633c9555dc
Merge pull request #43804 from m4gr3d/update_signing_and_zipalign_logic_3_2
[3.2] Update gradle build files to automatically perform signing and zipalign tasks for custom builds
2020-11-24 08:39:16 +01:00
Rémi Verschelde
2800ab75ad
Merge pull request #43739 from dakennedyd/3.2
Fix duplicated entries in script editor menu
2020-11-23 15:49:33 +01:00
David Kennedy
473cb79cc1 Fix duplicates entries in script editor menu
This was a regression from #40461.

Fixes #43707.
2020-11-23 11:33:59 -03:00
Rémi Verschelde
7dfd4ced51
Merge pull request #43792 from Faless/js/3.x_lint
[3.2] [HTML5] Linting, fixes.
2020-11-23 14:44:58 +01:00
Fabio Alessandrelli
f316a1719d [HTML5] Run eslint --fix.
Should I write a poem about this whole new world? ;)
2020-11-23 13:27:13 +01:00
Fabio Alessandrelli
0813008b8a [HTML5] Enforce JavaScript style with eslint.
Applies to javascript files inside the platform library folder, the
exposed Engine code, and any javascript files in modules.

Files ending with ".externs.js" will be ignored, you can create a
".eslintignore" file to specify extra files to be ignored.
2020-11-23 13:26:19 +01:00
Rémi Verschelde
0b7e833249
Merge pull request #43789 from RandomShaper/ref_singleton_warn_3.2
Make warning about Reference singletons more accurate (3.2)
2020-11-23 11:26:17 +01:00
Pedro J. Estébanez
8ec5ffe17e Make warning about Reference singletons more accurate 2020-11-23 10:42:50 +01:00
Rémi Verschelde
e4f2f899db
Merge pull request #43697 from Calinou/increase-profiler-frame-max-functions
Increase the default `profiler_frame_max_functions` to 512
2020-11-23 10:02:37 +01:00
Rémi Verschelde
f6c0dc33c3
Merge pull request #43780 from lawnjelly/ewok_zero_texture
Put in check for zero sized textures
2020-11-23 08:03:41 +01:00
Fredia Huya-Kouadio
d13d29240c Update gradle build files to automatically perform signing and zipalign tasks for custom builds. 2020-11-22 17:54:12 -08:00
lawnjelly
1d65b83cdb Put in check for zero sized textures
To prevent divide by zero.
2020-11-22 18:09:05 +00:00
lawnjelly
3c69377f10 2d Legacy - close vulnerabilities and more debug checks
While adding more debug checks to legacy renderer, I closed 2 types of vulnerabilities:

* TYPE_PRIMITIVE would previously read from uninitialized data if only specifying a single color
* Other legacy draw operations would fail in debug AFTER accessing out of bounds memory rather than before

Many calls to glBufferSubData are wrapped in a safe version which checks for out of bounds and exits the draw function if this is detected.
2020-11-22 16:09:02 +00:00
Rémi Verschelde
b900ec03f0
Merge pull request #43720 from lawnjelly/ewok_asserts
Batching - more error checking options
2020-11-22 12:16:46 +01:00
lawnjelly
4ae797b802 Batching - more error checking options
This adds some more error checking options for development, and simplifies the control flow checks which now become debug asserts.
2020-11-21 15:12:36 +00:00
Fabio Alessandrelli
e4cdae3624 [HTML5] Libraries refactor for linting.
Initial work to make liniting easier.

This includes:
- Rename http_request.js to library_godot_http_request.js.
- Rename externs.js to engine.externs.js.
- New library_godot_runtime.js (GodotRuntime) wraps around emscripten
  functions.
- Refactor of XMLHttpRequest handler in engine/preloader.js.
- Few fixes to bugs spotted by early stage linting.
2020-11-21 14:23:32 +01:00
Rémi Verschelde
279f4fbb5f
Merge pull request #43724 from Calinou/doc-update-light-limits
Update the number of lights supported in OmniLight and SpotLight docs
2020-11-20 18:47:35 +01:00
Hugo Locurcio
8adaf603d1
Update the number of lights supported in OmniLight and SpotLight docs
Follow-up to #43606.
2020-11-20 14:07:33 +01:00
Rémi Verschelde
06389f705b
Merge pull request #43683 from akien-mga/3.2-cherrypicks
Cherry-picks for the 3.2 branch (future 3.2.4) - 9th batch
2020-11-19 22:12:23 +01:00
Hugo Locurcio
c4e200687e
Increase the default profiler_frame_max_functions to 512
This should decrease the number of instances in which functions
don't appear in the profiler.

This partially addresses #40251.
2020-11-19 19:37:53 +01:00
GryphonClaw
27eaf357fc
added shortcuts/hotkeys for tileset editor plugin collision buttons, with suggested changes.
(cherry picked from commit cf582262c2)
2020-11-19 17:17:23 +01:00
Pedro J. Estébanez
9df6edc7d7
Warn about singleton being a Reference
(cherry picked from commit e1150bd912)
2020-11-19 17:15:28 +01:00
Aaron Franke
b9641efc5c
Update the 3D grid when the "View Grid" checkbox is changed
(cherry picked from commit 71d1909b39)
2020-11-19 17:15:28 +01:00
Fredia Huya-Kouadio
16181a38eb
Fix zipalign command name on Windows machines.
(cherry picked from commit c4f2d87747)
2020-11-19 17:15:28 +01:00
Phischermen
776faa5c92
Clarify that SceneTree::quit() does not immediately end the application.
(cherry picked from commit 371d12a2f0)
2020-11-19 17:15:27 +01:00
Pedro J. Estébanez
ebdcf1cc60
Fix crash duplicating local-to-scene resources
(cherry picked from commit e99cf6bfe5)
2020-11-19 17:15:27 +01:00
Rafał Mikrut
32017b1490
Allow to open multiple projects when some are not imported or without main scene.
(cherry picked from commit b20c20a6f7)
2020-11-19 17:15:27 +01:00
Haoyu Qiu
c0fb16a512
Fixes rotation in select mode on macOS
(cherry picked from commit 381ba7d554)
2020-11-19 17:15:27 +01:00
Rémi Verschelde
387597a4a4
OSX: Fix linking with osxcross for arm64
For some reason the `-target` option on the `LINKFLAGS` was causing a weird
issue where osxcross' clang wrapper would attempt using the system `/bin/ld`
instead of the osxcross version (which is Apple's `ld64`).

The error message would be:
```
/bin/ld: unrecognized option '-dynamic'
```

Also removed from `CCFLAGS` for consistency, it seems to work fine with only
`-mmacosx-version-min`.

(cherry picked from commit dbbbb53927)
2020-11-19 17:15:27 +01:00
bruvzg
bc25b80c0f
[macOS / ARM64] Remove "-msse2" flag from ARM64 release export template build.
(cherry picked from commit 09f301029a)
2020-11-19 17:14:56 +01:00
PouleyKetchoupp
336506a273
OSX: Fix compiling for arm64 with OSXCross
(cherry picked from commit 08b0fd4330)
2020-11-19 17:14:52 +01:00
Rémi Verschelde
09f3a21ccc
Merge pull request #43690 from lawnjelly/ewok_builtin_prevent_item
Prevent item joining with custom shaders using selected BUILTINs
2020-11-19 17:02:27 +01:00
lawnjelly
1394df3188 Prevent item joining with custom shaders using selected BUILTINs
Large FVF allows batching of many custom shaders, but should not join items which have shaders that utilize BUILTINs which would change for each item, because these will not be sent individually, and all joined items would wrongly use the values from the first joined item.
2020-11-19 15:09:33 +00:00
Rémi Verschelde
3a8e1f324f
Merge pull request #43679 from lawnjelly/ewok_rect_color_fix
Prevent poly color path when translating batches than are non-poly
2020-11-19 11:56:02 +01:00
Rémi Verschelde
93936ad978
Merge pull request #43678 from bruvzg/fix_focus_loss
Fix focus loss on macOS.
2020-11-19 11:55:37 +01:00
lawnjelly
f84f1e8b81 Prevent poly color path when translating batches than are non-poly
A previous fix for poly colors had caused a regression in the rect behaviour, this PR re-enables proper translation of rect batches.
2020-11-19 10:10:09 +00:00
bruvzg
718ff146e0
Fix focus loss on macOS. 2020-11-19 11:55:25 +02:00
Rémi Verschelde
68973cadf7
glTF: Workaround import failure with invalid embedded images
image/gif is not supported in the glTF 2.0 specification,
these files are broken. But let's be lenient...

Fixes #43638.

(cherry picked from commit f70cc0a60e)
2020-11-18 13:28:51 +01:00
Marcus Brummer
420df0c2a8
Fixed deletion of nodes with exported node paths
(cherry picked from commit 3629651ef8)
2020-11-18 13:27:47 +01:00
Rémi Verschelde
b30d2e5d39
Merge pull request #43642 from lawnjelly/ewok_blank_uvs
Batching - blank UVs in polys that contain no UVs
2020-11-18 12:27:47 +01:00
lawnjelly
4cadae5713 Batching - blank UVs in polys that contain no UVs
Polys that have no texture assigned contain no UVs in the poly command. These were previously not blanked, leading to random values if read from a custom shader.

This PR just blanks them.
2020-11-18 10:36:47 +00:00
Rémi Verschelde
545931545c
Merge pull request #43631 from RandomShaper/fix_no_window_3.2
Ignore query to maximize/minimize window on Windows and X11
2020-11-18 09:11:56 +01:00
Pedro J. Estébanez
0642f3efeb Ignore query to maximize/minimize window on Windows and X11
This makes these platform behave as MacOS in that regard and also fixes the editor window appearing in some cases even when --no-window has been passed.
2020-11-18 00:33:39 +01:00
Marcel Admiraal
04103db6bd
Fix godot_js_websocket_send function unused assignment.
(cherry picked from commit 112e2fdfc3)
2020-11-17 22:25:49 +01:00
Marcel Admiraal
e1b72e1943
Add missing javascript semi-colons.
(cherry picked from commit f42284ed07)
2020-11-17 22:25:32 +01:00
Fabio Alessandrelli
f32c878ef7
Fix CLI export when export_path is in preset.
Export presets contains the export_path option, to specify the default
export location, but the CLI export option disregarded that, and always
required and export path to be specified.
After this commit, if the export path is not specified in the command,
the one in the preset will be used, erroring only if it's not present or
invalid.

(cherry picked from commit 032a1c5dc3)
2020-11-17 22:23:09 +01:00