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

Laser guidance for all designators #3308

Merged
merged 16 commits into from
Oct 8, 2016
Merged

Laser guidance for all designators #3308

merged 16 commits into from
Oct 8, 2016

Conversation

nicolasbadano
Copy link
Contributor

@nicolasbadano nicolasbadano commented Feb 12, 2016

Tasks:

  • Enable ace_laser to interact with vanilla lasers.
  • Make laser dispersion optional, default off.
  • Rewrite fnc_shootRay using lineIntersectsSurfaces.
  • Deprecate laser_selfdesignate in favor of the laser_designate?

@PabstMirror PabstMirror changed the base branch from master to release September 21, 2016 04:36
@PabstMirror PabstMirror changed the base branch from release to master September 21, 2016 04:36
@PabstMirror
Copy link
Contributor

@esteldunedain did some work on this and I think we can grab it for 3.8

Fix #4420 (someone else is trying to use the framework, so I'd like to get this merged even if we don't have some of the other stuff done)
Fix #1959
Fix #967

I merged laser_designate into laser
lase_selfDesignate really isn't nessacary so was dropped
rewrote big chunk of laser
using lineIntersetsSurfaces was much faster for shootRay

If anyone wants to test it out, there is a hidden vehicle that you can spawn in ACE_Comanche_Test

@PabstMirror PabstMirror modified the milestones: 3.8.0, Backlog Sep 21, 2016
@PabstMirror PabstMirror added kind/bug-fix Release Notes: **FIXED:** and removed status/experimental labels Sep 21, 2016
@PabstMirror PabstMirror self-assigned this Sep 21, 2016
@nicolasbadano
Copy link
Contributor Author

👍 @PabstMirror, I'm glad to see this being rescued from oblivion.

@PabstMirror PabstMirror added kind/enhancement Release Notes: **IMPROVED:** kind/cleanup Release Notes: **CHANGED:** and removed status/needs-testing status/WIP labels Sep 30, 2016
@jaynus jaynus mentioned this pull request Sep 30, 2016
26 tasks
@PabstMirror
Copy link
Contributor

This seems to be working in mp
Moved some of the laser todos to #380

We still don't have any vehicles that are using this right now besides the ACE_Comanche_Test
I'm not sure if we want to re-add laser/dagr weapons to the main comanche, we could make it optional (3den attribute?)

@nicolasbadano
Copy link
Contributor Author

I'm not sure if we want to re-add laser/dagr weapons to the main comanche, we could make it optional

If it's possible to add them to the main Comanche as optional, then 👍 for that. But if not, I think we could keep it sepparate for now.

@PabstMirror
Copy link
Contributor

I'm thinking it would work similar to #3043
Using something like removeWeaponTurret and addWeaponTurret to just swap launchers/ ammo.

@nicolasbadano
Copy link
Contributor Author

Using something like removeWeaponTurret and addWeaponTurret to just swap launchers/ ammo.

@PabstMirror, great idea; that sounds perfect.

@thojkooi thojkooi merged commit ab6fc8e into master Oct 8, 2016
@thojkooi thojkooi deleted the laserGuidanceCleanup branch October 8, 2016 10:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/bug-fix Release Notes: **FIXED:** kind/cleanup Release Notes: **CHANGED:** kind/enhancement Release Notes: **IMPROVED:**
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants