Skip to content

Lab asteroid viewer#6710

Merged
wookieejedi merged 3 commits into
scp-fs2open:masterfrom
MjnMixael:lab_asteroid_viewer
Jun 8, 2025
Merged

Lab asteroid viewer#6710
wookieejedi merged 3 commits into
scp-fs2open:masterfrom
MjnMixael:lab_asteroid_viewer

Conversation

@MjnMixael

@MjnMixael MjnMixael commented May 5, 2025

Copy link
Copy Markdown
Contributor

Adds the ability to view asteroids/debris in the F3 lab. Depends on #6704 but wanted to get it up so that it can be accounted for heading into RC.

I should say this includes a small fix to an asteroid parsing bug I found to prevent duplicate asteroids from being created as asteroid subtypes.

@MjnMixael MjnMixael added this to the Release 25.0 milestone May 5, 2025
@MjnMixael MjnMixael added enhancement A new feature or upgrade of an existing feature to add additional functionality. Lab A feature or bug related to the F3 lab labels May 5, 2025
@MjnMixael MjnMixael mentioned this pull request May 9, 2025
@MjnMixael MjnMixael force-pushed the lab_asteroid_viewer branch from 0416b62 to 4ca42f0 Compare May 26, 2025 14:01

@Baezon Baezon left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Looks pretty good, just a few things.

Comment thread code/lab/labv2.h Outdated
Comment thread code/lab/manager/lab_manager.h Outdated
Comment thread code/asteroid/asteroid.cpp Outdated
@wookieejedi

Copy link
Copy Markdown
Member

Awesome, with this approved I'll plan to merge later today. One step closer to 25.0!

@wookieejedi wookieejedi merged commit 8410ed0 into scp-fs2open:master Jun 8, 2025
18 checks passed
@MjnMixael MjnMixael deleted the lab_asteroid_viewer branch June 8, 2025 18:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

enhancement A new feature or upgrade of an existing feature to add additional functionality. Lab A feature or bug related to the F3 lab

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants