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

Add EH for UAV control, Add Hellfire support #5305

Merged
merged 5 commits into from
Aug 22, 2017
Merged

Add EH for UAV control, Add Hellfire support #5305

merged 5 commits into from
Aug 22, 2017

Conversation

PabstMirror
Copy link
Contributor

Fix #5301

Needs testing on dedicated, as PlayerViewChanged was unreliable in the past.

@PabstMirror PabstMirror added kind/bug-fix Release Notes: **FIXED:** status/needs-testing labels Jun 22, 2017
@PabstMirror PabstMirror added this to the 3.11.0 milestone Jun 22, 2017
@PabstMirror PabstMirror mentioned this pull request Jun 23, 2017
Merged
@tbeswick96
Copy link
Contributor

tbeswick96 commented Jun 24, 2017 •
edited
Loading

Used this earlier on a dedicated server. I had the display just fine, but had no option to change the hellfire mode. Will test again tomorrow to be sure.
From experience dealing with UAV interactions before, it does not use the UAV as interactions, but whatever vehicle the player is in (as per the bug report). I got around this for my purposes by adding the interactions on the player (self-interactions).

@PabstMirror
Copy link
Contributor Author

@tbeswick96 - Thanks for feedback, I've fixed the cycle guidance keybind for UAVs (Ctrl+Tab)
Interaction menu working directly on UAVs might be possible, but probably won't get to it in this PR

When testing in MP the PlayerViewChanged was broken, but I've written something that uses it to start polling for an actual state change, but only runs for a limited time. Could use a second look on it (common/postInit code)

Neviothr
Neviothr reviewed Jun 26, 2017
View reviewed changes
addons/common/XEH_postInit.sqf Outdated
@@ -317,6 +317,30 @@ GVAR(OldIsCamera) = false;
END_COUNTER(stateChecker);
}, 0.5, []] call CBA_fnc_addPerFrameHandler;

// Add event handler for UAV control change
ACE_controlledUAV = [objnull, objnull, [], ""];
Copy link
Contributor

Choose a reason for hiding this comment

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

Camel case in objNull.

Neviothr
Neviothr reviewed Jun 26, 2017
View reviewed changes
addons/common/XEH_postInit.sqf Outdated
params ["", "", "", "", "", "_UAV"];

private _position = (UAVControl _UAV) param [1, ""];
private _seatAI = objnull;
Copy link
Contributor

Choose a reason for hiding this comment

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

Same.

Neviothr
Neviothr reviewed Jun 26, 2017
View reviewed changes
addons/common/XEH_postInit.sqf Outdated
private _UAV = getConnectedUAV player;
if (!alive player) then {_UAV = objNull;};
private _position = (UAVControl _UAV) param [1, ""];
private _seatAI = objnull;
Copy link
Contributor

Choose a reason for hiding this comment

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

And here.

@PabstMirror PabstMirror mentioned this pull request Jul 16, 2017
Merged
@tbeswick96 @PabstMirror
UAV Self-interactions (#5379)
9d08a03 
* Switch ACE_Player to uav AI on valid seat change

* Different approach to UAV interactions

* Forgot to remove a variable

* Changed param to select
jonpas
jonpas approved these changes Aug 22, 2017
View reviewed changes
Copy link
Member

@jonpas jonpas left a comment

Choose a reason for hiding this comment

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

Some magic, looks good to me.

@PabstMirror PabstMirror merged commit 74fd0f5 into master Aug 22, 2017
@PabstMirror PabstMirror deleted the uavEvent branch August 22, 2017 21:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Neviothr Neviothr Neviothr left review comments

@jonpas jonpas jonpas approved these changes

Assignees
No one assigned
Labels
kind/bug-fix Release Notes: **FIXED:**
Projects
None yet
Milestone
3.11.0
Development

Successfully merging this pull request may close these issues.
4 participants
@PabstMirror @tbeswick96 @jonpas @Neviothr