Skip to content

scale effects for muzzle and hits#6731

Merged
wookieejedi merged 3 commits into
scp-fs2open:masterfrom
Kestrellius:muzzle-trigger-radius
May 27, 2025
Merged

scale effects for muzzle and hits#6731
wookieejedi merged 3 commits into
scp-fs2open:masterfrom
Kestrellius:muzzle-trigger-radius

Conversation

@Kestrellius

Copy link
Copy Markdown
Contributor

Adds proper curve scaling by trigger radius for muzzle effects and hit effects.

@wookieejedi wookieejedi added cleanup A modification or rewrite of code to make it more understandable or easier to maintain. particles An item related to the particle system labels May 22, 2025
Comment thread code/ai/aiturret.cpp Outdated

@wookieejedi wookieejedi 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.

Overall this looks straightforward and good to me, though I'll hold off approving and merging for a day or so in-case @BMagnu or any others wanted to give it a quick pass.

@wookieejedi wookieejedi added the fix A fix for bugs, not-a-bugs, and/or regressions. label May 27, 2025
@wookieejedi

Copy link
Copy Markdown
Member

Bmagnu stated this also looked good, so I'll plan to merge later today.

@wookieejedi wookieejedi merged commit 106afbe into scp-fs2open:master May 27, 2025
16 checks passed
@Kestrellius Kestrellius deleted the muzzle-trigger-radius branch May 27, 2025 17:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

cleanup A modification or rewrite of code to make it more understandable or easier to maintain. fix A fix for bugs, not-a-bugs, and/or regressions. particles An item related to the particle system

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants