godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
28,233 Commits 15 Branches 59 Tags 2.2 GiB
08a46bbacd
Commit Graph

28233 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pedro J. Estébanez
08a46bbacd Put misc. 3D tool visible instances on their own layer 
This makes that visible stuff invisible to ReflectionProbes, whose preview in the editor shouldn't involve them.
 2020-11-26 20:08:30 +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
lawnjelly
1d65b83cdb Put in check for zero sized textures 
To prevent divide by zero.
 2020-11-22 18:09:05 +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
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
Rémi Verschelde
755ee76871
Revert "Add script class categories to EditorInspector." 
This reverts commit 8a02f221b4.

This caused regression #43491.
 2020-11-17 22:21:32 +01:00
Rémi Verschelde
04698a6d96
Merge pull request #43620 from Xrayez/doc-image-texture-3.2 
[3.2] Describe `ImageTexture`, `Image` creation and usage
 2020-11-17 17:37:49 +01:00
Andrii Doroshenko (Xrayez)
2edd489f83 Describe ImageTexture, Image creation and usage 
Ported from commit 0ee88d6705.
 2020-11-17 18:06:52 +02:00
Rémi Verschelde
08028fa1ee
glad: Sync with upstream 0.1.34 2020-11-17 16:42:42 +01:00
Rémi Verschelde
4816317bbc
Debugger: Save options in project metadata 
Fixes #19542.

(cherry picked from commit 090361f3c9)
 2020-11-17 16:42:42 +01:00
Hugo Locurcio
fcab27878c
Require Ctrl for switching between editors, bind F2 to Rename Node 
Switching between editors now requires holding Ctrl to avoid
conflicts with the new F2 shortcut.

The asset library can now be accessed by pressing Ctrl + F4
on Windows and Linux, or Alt + 4 on macOS.

This partially addresses #38139.

(cherry picked from commit 79e4e26738)
 2020-11-17 16:24:06 +01:00
Rémi Verschelde
d099b6cf60
Merge pull request #43606 from NHodgesVFX/3.2 
Make lights_per_object configurable
 2020-11-17 16:20:38 +01:00
Unknown
5965fbd9fa Make lights_per_object configurable 2020-11-17 10:03:44 -05:00
Rémi Verschelde
8dde60d133
Merge pull request #43613 from akien-mga/3.2-cherrypicks 
Cherry-picks for the 3.2 branch (future 3.2.4) - 8th batch
 2020-11-17 13:07:26 +01:00
Rémi Verschelde
fc718d87a6
doc: Add description for rendering/quality/2d/use_transform_snap 
Co-authored-by: lawnjelly <lawnjelly@gmail.com>
 2020-11-17 12:23:58 +01:00
Rémi Verschelde
e95af7ae9b
i18n: Sync translations with Weblate 2020-11-17 12:21:11 +01:00
Pedro J. Estébanez
58e9bf494d
Fix crash in resoure duplicate 
(cherry picked from commit 9450717571)
 2020-11-17 12:07:02 +01:00
Marcus Brummer
a822bb9844
Fixed exit code retrieval of spawned processes on Windows 
Use GetExitCodeProcess() on Windows to retrieve the exit code of a process in
OS:excute()

(cherry picked from commit f0f4220b05)
 2020-11-17 12:07:02 +01:00
Hugo Locurcio
3a46e01af3
Remove property groups for Pause Mode and Script 
Each of those only grouped 1 property, making them useless.

This closes https://github.com/godotengine/godot-proposals/issues/1840.

(cherry picked from commit 5770e08c2a)
 2020-11-17 12:07:02 +01:00