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

Add trigger options to weapon events / repetition #1107

Merged
merged 9 commits into from
Apr 7, 2019
Merged

Conversation

jonpas
Copy link
Member

@jonpas jonpas commented Apr 2, 2019

When merged this pull request will:

  • Add options to weapon events / weapon animations framework / weapon repetition:
    • Leave Optics: leave optics view to bolt/rack (old default)
    • Trigger Release: release trigger to bolt/rack (new default)
    • Trigger Press: press trigger again to bolt/rack

TODO:

  • Make CBA_triggerPressed GVAR or public API -> GVAR
  • Set default option to Trigger Release
    • Friendlier to new users and used in more games
  • Support non-LMB triggers -> later if requested (if anyone even uses non-LMB trigger)
  • Add option for vanilla behaviour (Trigger Release default accomplishes the same) -> later if requested
  • Rename "Trigger Press" to "Trigger Re-Press" -> nope

@jonpas
Copy link
Member Author

jonpas commented Apr 4, 2019

Done, confirmed in-game with CUP Lee Enfield.

I decided to not support non-LMB triggers or add vanilla behaviour at this time, reasons above. Can be added later if requested.

Should I rename "Trigger Press" to "Trigger Re-Press" to make it clearer or is it clear enough?

@jonpas jonpas modified the milestones: 3.10.2, 3.11 Apr 4, 2019
@jonpas
Copy link
Member Author

jonpas commented Apr 4, 2019

On hold for @commy2's settings update that will allow adding settings in preInit regardless of load order.

Will remove CBA_settingsInitialized as it won't be needed.

@jonpas jonpas changed the title WIP: Add trigger options to weapon events Add trigger options to weapon events Apr 5, 2019
@commy2 commy2 merged commit ef8a10f into master Apr 7, 2019
@commy2 commy2 deleted the wef-holdtrigger branch April 7, 2019 13:46
@commy2 commy2 modified the milestones: 3.11, 3.10.2 Apr 7, 2019
@jonpas jonpas changed the title Add trigger options to weapon events Add trigger options to weapon events / repetition Apr 7, 2019
@commy2 commy2 modified the milestones: 3.10.2, 3.11 Apr 7, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants