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.

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

feat(update): 2024 07 15 delta updating #67

Merged
merged 77 commits into from
Jul 15, 2024

Conversation

Zitchas
Copy link
Member

@Zitchas Zitchas commented Jul 15, 2024

As per title, updating Delta to latest and resolving conflicts.

Koranir and others added 30 commits June 5, 2024 08:41
TomGoodIdea and others added 16 commits July 4, 2024 15:26
…le (endless-sky#10291)

2 lines between variants of the same base model, 3 lines between different base models
@Zitchas Zitchas added the Updating Update PRs (used when conflicts happen) label Jul 15, 2024
@Zitchas Zitchas self-assigned this Jul 15, 2024
@Zitchas
Copy link
Member Author

Zitchas commented Jul 15, 2024

By way of explanation regarding the data changes in DataWriter; it's basically just a case of now using DataWriter:Quote(...) to encapsulate those named items that have spaces in the name. So where it used to be:
<< "thrust heat/s" << ',' << "turn/s" << ','
it is now:
<< DataWriter( "thrust heat/s") << ',' << "turn/s" << ','

For things that don't have spaces, I'm told that it is more correct to use it anyway, but not required.

@Zitchas
Copy link
Member Author

Zitchas commented Jul 15, 2024

Alright, looks good now, as soon as the checks finish.

@Zitchas Zitchas merged commit 88ea4a7 into endless-sky:experimental Jul 15, 2024
18 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Updating Update PRs (used when conflicts happen)
Projects
None yet
Development

Successfully merging this pull request may close these issues.