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

0.9.x Updates 2024-04-18 to 04-22 by SGT #846

Merged
merged 33 commits into from
Apr 25, 2024
Merged

0.9.x Updates 2024-04-18 to 04-22 by SGT #846

merged 33 commits into from
Apr 25, 2024

Conversation

stephengtuggy
Copy link
Contributor

@stephengtuggy stephengtuggy commented Apr 23, 2024 •
edited
Loading

Thank you for submitting a pull request and becoming a contributor to the Vega Strike Core Engine.

Please answer the following:

Code Changes:

Issues:
Fixes #844 for 0.9.x
Attempts to fix #837 for 0.9.x

Purpose:

  • What is this pull request trying to do? Primarily, fix the backdoored liblzma issue, ASAP. Secondarily, make various improvements to the CI workflows, and also try to fix the crashes in GFXDeleteTextures(...).
  • What release is this for? 0.9.x
  • Is there a project or milestone we should apply this to? 0.9.x

@stephengtuggy stephengtuggy added this to the 0.9.x milestone Apr 23, 2024
@stephengtuggy stephengtuggy self-assigned this Apr 23, 2024
BenjamenMeyer
BenjamenMeyer approved these changes Apr 23, 2024
View reviewed changes
engine/src/gfx/sprite.h Show resolved Hide resolved
Stephen G added 2 commits April 23, 2024 08:43
Merge remote-tracking branch 'refs/remotes/upstream/0.9.x' into 0.9.x…
a4cff20 
…_SGT_2024-04-18

# Conflicts:
#	.github/workflows/Windows-Release.yml
#	.github/workflows/macos-release.yml
particle.cpp/.h: Initialize all fields; delete texture only if refcou…
cee2a00 
…nt drops to zero
@stephengtuggy stephengtuggy changed the base branch from master to 0.9.x April 23, 2024 16:26
@stephengtuggy stephengtuggy linked an issue Apr 23, 2024 that may be closed by this pull request
Game crashes in GFXDeleteTextures(...) #837
Closed
stephengtuggy
stephengtuggy commented Apr 24, 2024
View reviewed changes
.github/dependabot.yml Outdated Show resolved Hide resolved
@stephengtuggy stephengtuggy mentioned this pull request Apr 25, 2024
Open
BenjamenMeyer
BenjamenMeyer reviewed Apr 25, 2024
View reviewed changes
Copy link
Member

@BenjamenMeyer BenjamenMeyer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

a few comments to keep in mind; but generally looking good

@stephengtuggy
Copy link
Contributor Author

a few comments to keep in mind; but generally looking good

@BenjamenMeyer thanks.

@stephengtuggy
vs_logging.cpp/.h: Switch back to synchronous sinks. Also switch back…
4716afe 
… to the #include <boost/....hpp> form instead of #include "..."
@stephengtuggy
Copy link
Contributor Author

Well, that last commit was a winner lol.

With regard to the logging system: A few days ago, I thought I would try switching to asynchronous logging, to see if that increased performance. Well, maybe it did and maybe it didn't. But what I primarily noticed was that the last message logged before program shutdown, never made it to the console. No matter what I tried.

So I am switching back to synchronous sinks. Maybe I'll try the async version again some other time.

@stephengtuggy
Copy link
Contributor Author

Also: Rocky Linux 8.9 keeps throwing one error after another. I think I'm going to allow it to fail for now. And maybe stop building it at all in the CI, until further notice.

@stephengtuggy stephengtuggy marked this pull request as ready for review April 25, 2024 11:41
@stephengtuggy
Copy link
Contributor Author

Also: Rocky Linux 8.9 keeps throwing one error after another. I think I'm going to allow it to fail for now. And maybe stop building it at all in the CI, until further notice.

Done ✔️

@stephengtuggy
Copy link
Contributor Author

I have switched back to using synchronous logging sinks. The logging system seems to be working again, more or less as before.

@stephengtuggy stephengtuggy removed a link to an issue Apr 25, 2024
Game crashes in GFXDeleteTextures(...) #837
Closed
@stephengtuggy
Copy link
Contributor Author

... And #837 is not fixed. Damn. Oh well, I need to get this merged to fix the other issue (#844 ).

I'm going to go ahead and merge.

@stephengtuggy stephengtuggy merged commit dceef2d into vegastrike:0.9.x Apr 25, 2024
29 checks passed
@stephengtuggy stephengtuggy deleted the 0.9.x_SGT_2024-04-18 branch April 25, 2024 18:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@BenjamenMeyer BenjamenMeyer BenjamenMeyer approved these changes

Assignees

@stephengtuggy stephengtuggy

Labels
bug CI/CD
Projects
None yet
Milestone
0.9.x
Development

Successfully merging this pull request may close these issues.

Our vcpkg setup is pulling the backdoored version of liblzma/xz!
2 participants
@stephengtuggy @BenjamenMeyer