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

redo CBA_fnc_addKeybind to support multiple keybinds #656

Merged
merged 1 commit into from
May 1, 2017
Merged

redo CBA_fnc_addKeybind to support multiple keybinds #656

merged 1 commit into from
May 1, 2017

Conversation

commy2
Copy link
Contributor

@commy2 commy2 commented Apr 24, 2017

When merged this pull request will:

  • use a new profile registry which can have infinite binds for each key action instead of just one.
  • fixes some race conditions when CBA_fnc_addKeybind is used in preInit before keybinding's preInit.
  • use "$" to glue strings instead of "_" to avoid MyMod_super with keybind to collide with MyMod super_keybind.

todo:

  • fix:
15:44:41 Error in expression <ns = (cba_keybinding_handlers select 1) select ((cba_keybinding_handlers select >
15:44:41   Error position: <select ((cba_keybinding_handlers select >
15:44:41   Error Zero divisor
15:44:41 File x\cba\addons\keybinding\gui\fnc_updateGUI.sqf, line 47

@commy2 commy2 added this to the 3.4 milestone Apr 24, 2017
@commy2 commy2 self-assigned this Apr 24, 2017
@commy2 commy2 mentioned this pull request Apr 24, 2017
Merged
@commy2 commy2 removed the WIP label Apr 24, 2017
@commy2 commy2 changed the base branch from fix-#213 to keybinding May 1, 2017 02:11
@commy2 commy2 changed the base branch from keybinding to fix-#213 May 1, 2017 02:12
@commy2 commy2 changed the base branch from fix-#213 to keybinding May 1, 2017 02:17
@commy2 commy2 merged commit be38e50 into keybinding May 1, 2017
@commy2 commy2 deleted the CBA_fnc_addKeybind-redo branch May 1, 2017 02:35
commy2 added a commit that referenced this pull request May 20, 2017
@commy2
Merge keybinding into master (#686)
141e256 
* Mouse support for CBA_fnc_addKeyHandler  (#651)

* use last possible single key as array size

* delete superfluous check, fix header

* roll less, but bigger numbers to generate random hashkey

* header formatting

* only compile functions on machines with interface

* add mission display ui events directly on display init

* rename display load functions for naming conventions

* prepare mouse handers in zeus display

* fix issues with blocking key events

* isEqualTo for maximum performance :S

* fix no return value making blocking undefined

* simplify

* better variable name

* remove a superfluous check

* add a comment to seperate key handler code from other stuff

* add support for mouse keys and the scroll wheel

* add mouse button translations (#652)

* add mouse button translations to custom dik codes

* fix keyHandler becoming unremovable if added to two different keys (#653)

* fix keyHandler becoming unremovable if added two different keys

* fix strange modifier key behavior (#654)

* fix strange modifier key behaviour

* disable modifier state in keyDown if released

* squash-CBA_fnc_addKeybind-redo (#656)

* fix a script error

* add function to translate keys

* joinString

* fix rebinding would delete default keyup handler

* CfgFunctions

* display multiple keybinds in diary

* fix for travis

* remake keybinding ui and add mouse support (#638)

* remake rebinding ui for mouse support

* remember last selected addon in keybinding ui
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Killswitch00 Killswitch00 Killswitch00 approved these changes

Assignees

@commy2 commy2

Labels
Enhancement
Projects
None yet
Milestone
3.4
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@commy2 @Killswitch00