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

Review ally collision for projectiles and beams #6628

Open
wants to merge 10 commits into
base: develop
Choose a base branch
from
Open

Review ally collision for projectiles and beams #6628

wants to merge 10 commits into from
+43 −60

Conversation

lL1l1
Copy link
Contributor

@lL1l1 lL1l1 commented Jan 17, 2025 •
edited
Loading

Issue

Beams and projectiles with CollideFriendly = true are not colliding with shields/units as expected.

Description of the proposed changes

  • Fix ally collision between units and projectiles
  • Fix ally collision between shields and projectiles/beams
    • now it matches the collision behavior between units and projectiles/beams, with an exception for the shield owner so that it can fire out of its own shield

Testing done on the proposed changes

The tested units hit what is expected.

Checklist

  • Changes are annotated, including comments where useful
  • Changes are documented in the changelog for the next game version

lL1l1 added 9 commits January 16, 2025 21:46
@lL1l1
Enable ally collision for UEB2101, XSB2301, UEL0401
4044d1e
@lL1l1
Optimize unit-Beam friendly collision
02d43d0
@lL1l1
Fix unit-projectile friendly collision
135f6ba 
Caused by FAForever#3847)
@lL1l1
Fix ShieldCollider spelling
6b9e6aa
@lL1l1
Add annotation for collision functions
4e30848 
fix not using three dashes before `@` in params
@lL1l1
Update shield-projectile collision check
9dd1162 
- remove neutral (army -1) proj check: it should error in `IsAlly` but I've never seen it happen with `Unit`s, and `CollideEntity = false` in the proj bp should be used to never even check collisions for such neutral projectiles

- fix CollideFriendly not working on shields
- fix own army CollideFriendly not colliding with shields, with exception for the shield owner
@lL1l1
Update shield-beam friendly collision
8121216 
- fix friendly collision, with exception for our owner
@lL1l1
Update AntiArtilleryShield collisions
c6da9ba 
hook style structure
@lL1l1
Revert "Enable ally collision for UEB2101, XSB2301, UEL0401"
b3b97b0 
This reverts commit 4044d1e.
@lL1l1 lL1l1 added type: bug area: sim Area that is affected by the Simulation of the Game labels Jan 17, 2025
@lL1l1 lL1l1 added this to the Development Iteration I of 2025 milestone Jan 17, 2025
@lL1l1 lL1l1 marked this pull request as ready for review January 17, 2025 07:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
area: sim Area that is affected by the Simulation of the Game type: bug
Projects
None yet
Milestone
Development Iteration I of 2025
Development

Successfully merging this pull request may close these issues.
1 participant
@lL1l1