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

Safemode - Fixed keybind conflict #7189

Merged
merged 1 commit into from
Oct 8, 2019
Merged

Safemode - Fixed keybind conflict #7189

merged 1 commit into from
Oct 8, 2019

Conversation

pterolatypus
Copy link
Contributor

When merged this pull request will:

  • Remove a (legacy?) check from fnc_lockSafety which prevented it from working if the keybind was a superset of the vanilla 'switch fire mode' keybind. The check seems to be trying to prevent a conflict, but that's already handled by cba keybinds.

Example:

  • switch fire mode - F
  • toggle safety - Ctrl+F
  • when pressing Ctrl+F nothing happens

@PabstMirror PabstMirror added this to the 3.13.0 milestone Sep 25, 2019
@PabstMirror PabstMirror added the kind/bug-fix Release Notes: **FIXED:** label Sep 25, 2019
@PabstMirror PabstMirror merged commit 06a0f30 into acemod:master Oct 8, 2019
@pterolatypus pterolatypus deleted the safemode-keybind branch November 14, 2019 16:07
@PabstMirror PabstMirror modified the milestones: 3.13.0, 3.13.0-temp1 Dec 30, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@PabstMirror PabstMirror PabstMirror approved these changes

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

Successfully merging this pull request may close these issues.
2 participants
@pterolatypus @PabstMirror