Skip to content

Adding missing MacOS commands #8693

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
Merged
merged 1 commit into from
Jan 2, 2024
Merged

Adding missing MacOS commands #8693

merged 1 commit into from
Jan 2, 2024

Conversation

@brentruhle
Copy link
Contributor

@brentruhle brentruhle commented Dec 31, 2023

Singular instance of the the F5 build command not having it's corresponding MacOS shortcut equivalent.

@AThousandShips
Copy link
Member

AThousandShips commented Dec 31, 2023

You should target master not 4.2, changes can then be cherry picked, see here.

If you need more information about the update process please see: here. If wanted I can fix the branch for you.

@AThousandShips AThousandShips added the needs work Needs additional work by the original author, someone else or in another repo label Dec 31, 2023
@AThousandShips

This comment was marked as outdated.

Sign in to view
@AThousandShips AThousandShips added archived and removed needs work Needs additional work by the original author, someone else or in another repo labels Dec 31, 2023
@AThousandShips
Copy link
Member

AThousandShips commented Dec 31, 2023

My bad was a different instance of the same, still needs to be rebased though

@AThousandShips AThousandShips added needs work Needs additional work by the original author, someone else or in another repo and removed archived labels Dec 31, 2023
@AThousandShips AThousandShips changed the base branch from 4.2 to master December 31, 2023 09:59
@brentruhle
Copy link
Contributor Author

brentruhle commented Dec 31, 2023

You should target master not 4.2, changes can then be cherry picked, see here.

If you need more information about the update process please see: here. If wanted I can fix the branch for you.

It looks like my commit has been intertwined with another users commits and I'm unable to resolve. Will need your assistance to fix. Thank you.

@AThousandShips
Copy link
Member

AThousandShips commented Dec 31, 2023

I will try and fix this when I have time 🙂, if you can use the command line interface you can follow my instructions above, this is due to starting from the wrong branch

@brentruhle @AThousandShips
Adding missing MacOS commands
da2c56c 
Singular instance of the the F5 build command not having it's corresponding MacOS shortcut equivalent.
@AThousandShips AThousandShips added enhancement area:getting started Issues and PRs related to the Getting Started section of the documentation cherrypick:4.1 cherrypick:4.2 and removed needs work Needs additional work by the original author, someone else or in another repo labels Jan 1, 2024
@mhilbrunner mhilbrunner merged commit 6a731a6 into godotengine:master Jan 2, 2024
@mhilbrunner
Copy link
Member

mhilbrunner commented Jan 2, 2024

Thanks for contributing! Merged. And also thanks to ATS for the assistance :)

mhilbrunner added a commit that referenced this pull request Jan 25, 2024
@mhilbrunner
Merge pull request #8693 from brentruhle/patch-2
b4d58e1 
Adding missing MacOS commands
@mhilbrunner
Copy link
Member

mhilbrunner commented Jan 25, 2024

Cherry-picked to 4.2.

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

Reviewers

@mhilbrunner mhilbrunner mhilbrunner approved these changes

@AThousandShips AThousandShips AThousandShips approved these changes

Assignees

No one assigned

Labels

area:getting started Issues and PRs related to the Getting Started section of the documentation cherrypick:4.1 enhancement

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@brentruhle @AThousandShips @mhilbrunner