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

1.6.0-development #6454

Merged
merged 74 commits into from
Sep 2, 2023
Merged

1.6.0-development #6454

merged 74 commits into from
Sep 2, 2023

Conversation

AJenbo
Copy link
Member

@AJenbo AJenbo commented Aug 12, 2023

No description provided.

glebm and others added 30 commits August 12, 2023 16:24
Adds handy helpers for performing algorithms on the entire container.
They're prefixed with `c_` for container.

This naming convention is identical to some popular C++ libraries, such
as Abseil.
Follow-up to #6403
Also updates SDL2 version to the latest SDL2 branch commit.
This is the version that is currently installed on GitHub Actions.
Adds a `ParseInt` function which uses `std::from_chars`.

From `std::from_chars` documentation:
> Unlike other parsing functions in C++ and C libraries,
> std::from_chars is locale-independent, non-allocating, and non-throwing.

Co-authored-by: Andrew James <[email protected]>
ephphatha and others added 18 commits August 24, 2023 05:46
No real need to persist this value
Also added an iterator based API, though it's not useful for this use-case. Might be nice in the future?

The field/record iterators is single-pass input iterators with shared state.
To avoid rescanning fields unnecessarily parseInt currently can only be called once, it would be possible to make these iterators bidirectional with a bit of extra state (holding onto the start pointer)

Co-authored-by: Gleb Mazovetskiy <[email protected]>
Usually we call fread in a loop until reaching EOF.
Reaching EOF is not an error, so we should not log it as such.

The error message was previously seen when loading demo files.
`DemoMsg` struct and event data are now kept separately.

RAM usage for the timedemo messages: -85% (1.8 MiB -> 261 KiB)

Demo (`.dmo`) file size: -57% (590,790 bytes -> 253,410 bytes)
@glebm
Copy link
Collaborator

glebm commented Aug 29, 2023

Some conflicts already. For the timedemo, I guess we'll want to regenerate the file from master using the --demo 0 --record 1 trick.

@AJenbo
Copy link
Member Author

AJenbo commented Aug 29, 2023

@glebm would you be willing to resolve the conflict with master by converting it's demo to the new format? :(

@glebm
Copy link
Collaborator

glebm commented Aug 29, 2023

@AJenbo sure, shall I merge master into development?

@AJenbo
Copy link
Member Author

AJenbo commented Aug 29, 2023

Yeah I think that makes sens as a way to resolve conflicts. I intent to merge develop with master rater then rebase once 1.5.1 is out.

ephphatha and others added 6 commits August 29, 2023 15:17
Reduces struct size and makes the types of coordinates more obvious.
Already checked at the start of the function, none of the sprite data lookups change that global.
glibc compatibility remains the same.

We now use Clang 18 and static libc++ for the Aarch64 build.
Linux x86 and x86_64 builds now use GCC 13.
@AJenbo AJenbo added this to the 1.6.0 milestone Sep 2, 2023
@AJenbo AJenbo merged commit df416dd into master Sep 2, 2023
17 of 18 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants