Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Cherry-picks for the 3.2 branch (future 3.2.3) - 4th batch #40653

Merged
merged 38 commits into from
Jul 24, 2020
Merged

Cherry-picks for the 3.2 branch (future 3.2.3) - 4th batch #40653

merged 38 commits into from
Jul 24, 2020

Conversation

akien-mga
Copy link
Member

Backports all the CI changes from the master branch too.

Calinou and others added 30 commits July 24, 2020 09:34
@Calinou @akien-mga
Add a margin to EditorSpinSlider to visually line up the edited number
3bdb39b 
This means clicking on an EditorSpinSlider to edit its value will
no longer cause the number to be visually offset while it's
being edited.

(cherry picked from commit cc615fe)
@fire @akien-mga
Allow gltf2 morph targets with no default values. Changes for bug 38751
f189d0e 
(cherry picked from commit 71ae0ff)
@rileylyman @akien-mga
implement generic filename disambiguation
582b431 
A static function is added to EditorNode which allows for filename
disambiguation given a list of filenames and the corresponding list of
absolute paths for those files. This function is then used to
disambiguate scene and script tabs in the editor.

(cherry picked from commit 4285211)
@ChristopheLY @akien-mga
bug with Tween.is_active, fixes godotengine#39760
8ef40b9 
(cherry picked from commit d60617d)
@stijn-h @akien-mga
Open scene selected from Quick Open dialog.
b7b8f86 
(cherry picked from commit 1ce3a77)
@theoway @akien-mga
Fixes the get_visible_line_count() of rich text label
dc7e9d4 
(cherry picked from commit bd32c27)
@Calinou @akien-mga
Document caveats related to Control scaling
11bceb3 
This is a common topic of confusion. Clarifying its intended scope
should make things easier to understand.

(cherry picked from commit a36912b)
@Calinou @akien-mga
Document which escape sequences are supported by String.c_unescape()
5c7802a 
See godotengine#38716.

(cherry picked from commit 04b2510)
@rcorre @akien-mga
Clarify how to convert PrimitiveMesh to ArrayMesh.
c774924 
It took me a bit to figure this out, as I was initially doing something
more complicated like this before I realized I just had to pass
get_mesh_arrays directly to add_surface_from_arrays.

```
var arr_mesh = ArrayMesh.new()
var arrays = []
arrays.resize(ArrayMesh.ARRAY_MAX)
arrays[ArrayMesh.ARRAY_VERTEX] = c.get_mesh_arrays()
arr_mesh.add_surface_from_arrays(Mesh.PRIMITIVE_TRIANGLES, arrays)
```

(cherry picked from commit 933bf96)
@Calinou @akien-mga
Mention the Data paths documentation in the File class
753ff1f 
This closes godotengine/godot-docs#3799.

(cherry picked from commit d4085d6)
@Paulb23 @akien-mga
Fix crash when closing a TextFile
ca4fe82 
(cherry picked from commit 54bca42)
@Calinou @akien-mga
Mention toggled signal for pressed state in BaseButton documentation
7e9a51c 
This closes godotengine#40455.

(cherry picked from commit 43dae28)
@Calinou @akien-mga
Complete the EditorSettings class documentation
52a33a8 
EditorSettings is now 100% documented.

(cherry picked from commit 708a0a4)
@Calinou @akien-mga
Improve the VisibilityNotifier and VisibilityEnabler class descriptions
0e44834 
(cherry picked from commit ce57cc4)
@Calinou @akien-mga
Document several editor-related classes to 100% completion
606d427 
(cherry picked from commit fb2e4d7)
@KoBeWi @akien-mga
Prevent multiple Controls moving inside container
5984feb 
(cherry picked from commit e44c910)
@Xrayez @akien-mga
Document the process of parsing command-line arguments
6416df8 
Co-authored-by: Hugo Locurcio <[email protected]>
(cherry picked from commit df80e25)
@KoBeWi @akien-mga
Prevent infinite loop in Tree incremental search
e511e0f 
(cherry picked from commit c047949)
@akien-mga
Fix Directory make_dir and make_dir_recursive
9b36357 
(cherry picked from commit 210ccb3)
@akien-mga
stb_vorbis: Update to upstream version 1.20
f922452 
Upstreams our crash fixes from godotengine#38422 and godotengine#40174.

(cherry picked from commit 8dffca4)
@Calinou @akien-mga
Document HTML5 CORS restrictions in HTTPClient and HTTPRequest
7078d33 
See godotengine#40247.

(cherry picked from commit 90db42d)
@akien-mga
TileSet Editor: Check polygon size before indexing
925371d 
Fixes godotengine#39722.

(cherry picked from commit 6f428f2)
@pouleyKetchoupp @akien-mga
Add option to disable virtual keyboard for LineEdit
930c880 
Co-authored-by: Alexander Holland <[email protected]>
(cherry picked from commit 0aa56e3)
@Calinou @akien-mga
Document polling rate limitations in InputEventMouseMotion
ad18e16 
This closes godotengine#40579.

(cherry picked from commit 924b7ea)
@neikeq @akien-mga
C#: Fix restore not called when building game projects
accc30e 
(cherry picked from commit 4a30289)
@follower @akien-mga
Fix presumed copy/paste error: "Returns" -> "Sets"
0fdfa47 
I might be going out on a limb here... :D

(cherry picked from commit e38b634)
@QbieShay @akien-mga
fixed documentation for get_hit_length of spring arm 3D
53a3476 
Co-authored-by: Hugo Locurcio <[email protected]>
(cherry picked from commit d1bff73)
@adam-bates @akien-mga
issue-40396 - Added missing error strings to JSON parsing when array …
b35970b 
…or object is never closed.

(cherry picked from commit 8f84dfa)
@mega-bit @akien-mga
Fix typos in GodotSharp code docs
93f297e 
(cherry picked from commit 0ca96ae)
@akien-mga
SCons: Remove unused DEBUG_MEMORY_ENABLED define
f1cdb91 
Its last use was removed in Godot 3.0, so it no longer makes sense to define.

Also removed `D3D_DEBUG_INFO` for Windows as it's likely a left over from a
long time ago pre-opensourcing when Godot had some form of Direct3D 9 support?

(cherry picked from commit dcf902d)
akien-mga and others added 8 commits July 24, 2020 10:31
@akien-mga
gitignore: Ignore binutils linker temp stXXXXXX objects
3d420c9 
Fixes godotengine#40607.

Co-authored-by: Hugo Locurcio <[email protected]>
(cherry picked from commit 5e8b188)
@asmaloney @akien-mga
[macOS] Fix Maya navigation with ALT + mouse scroll
cc8c618 
Methods were being called with InputEventMouseMotion instead of InputEventPanGesture, and they were null.

Fixes godotengine#16181 on the master branch

(cherry picked from commit 394a782)
@KoBeWi @akien-mga
Fix run project when current scene was never saved
2bcb9d2 
(cherry picked from commit 9c84e34)
@KoBeWi @akien-mga
Fix emoji branch compilation error
7e13120 
(cherry picked from commit 2407562)
@KoBeWi @akien-mga
Keep transition value when replacing key
307bac0 
(cherry picked from commit e1a1bb0)
@akien-mga
CI: Backport GitHub Actions setup from master
4567eee 
Removes AppVeyor and all Travis jobs but the iOS one, which hasn't been ported
to GitHub Actions yet (should be done soon).

Backports new style scripts from `master` branch too to do the same checks.
@akien-mga
Style: Add missing newlines to SVGs
eda0383
@akien-mga
Style: Sync other changes from new fix_style.sh and clang_format.sh
b40f3f9
@akien-mga akien-mga added this to the 3.2 milestone Jul 24, 2020
@akien-mga akien-mga requested review from hpvb, neikeq, reduz, vnen and a team as code owners July 24, 2020 08:40
@akien-mga akien-mga merged commit 8b8364c into godotengine:3.2 Jul 24, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hpvb hpvb Awaiting requested review from hpvb

@neikeq neikeq Awaiting requested review from neikeq

@reduz reduz Awaiting requested review from reduz

@vnen vnen Awaiting requested review from vnen

Assignees
No one assigned
Labels
bug enhancement topic:buildsystem topic:core topic:editor
Projects
None yet
Milestone
3.2
Development

Successfully merging this pull request may close these issues.