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 godot-cpp 4.1 branch - 6th batch #1306

Merged
merged 4 commits into from
Nov 13, 2023
Merged

Cherry-picks for the godot-cpp 4.1 branch - 6th batch #1306

merged 4 commits into from
Nov 13, 2023

Conversation

dsnopek
Copy link
Collaborator

@dsnopek dsnopek commented Nov 10, 2023

The 6th batch of PR's marked with cherrypick:4.1

@dsnopek dsnopek added bug This has been identified as a bug enhancement This is an enhancement on the current functionality labels Nov 10, 2023
@dsnopek dsnopek requested a review from a team as a code owner November 10, 2023 18:17
This was referenced Nov 10, 2023
Merged
Merged
Merged
Merged
Closed
@Spartan322 Spartan322 mentioned this pull request Nov 11, 2023
Merged
@AThousandShips
Copy link
Member

Would need to resolve #1296 before merging this

@akien-mga
Copy link
Member

Would need to resolve #1296 before merging this

No, this is what's needed to resolve #1296.

But I didn't merge yet due to CI being broken by godotengine/godot#84735.

@akien-mga
Copy link
Member

But I didn't merge yet due to CI being broken by godotengine/godot#84735.

I worked it around with #1308 and cherry-picked that to 4.1. So this should be ready to merge after rebasing to pass CI.

m4gr3d and others added 4 commits November 13, 2023 13:00
@m4gr3d @dsnopek
Update the environment variables used to access the Android NDK toolc…
29335d8 
…hain

(cherry picked from commit 86dbd5f)
@Repiteo @dsnopek
GDCLASS synced by ending with "private:"
805cdde 
• Matches implementation used by modules and godot itself
• Apply same to GDEXTENSION_CLASS, setup with same diff-friendly spacers as GDCLASS

(cherry picked from commit 6eb5d45)
@Repiteo @dsnopek
fix is_msvc and use_hot_reload variables
a1ae584 
(cherry picked from commit 648b8c4)
@brno32 @dsnopek
ignoring venv in .gitignore
731a10a 
(cherry picked from commit 92dd34a)
@akien-mga akien-mga merged commit 631cd5f into godotengine:4.1 Nov 13, 2023
12 checks passed
@akien-mga
Copy link
Member

Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@akien-mga akien-mga akien-mga approved these changes

Assignees
No one assigned
Labels
bug This has been identified as a bug enhancement This is an enhancement on the current functionality
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@dsnopek @AThousandShips @akien-mga @m4gr3d @Repiteo @brno32