Code

Merge keybinding into master#686

Code

Merged

commy2 merged 20 commits intomasterCBATeam/CBA_A3:masterfrom keybindingCBATeam/CBA_A3:keybindingCopy head branch name to clipboardMay 20, 2017

+1,130-1,420

Commits

Commits on May 1, 2017

• Mouse support for CBA_fnc_addKeyHandler (#651)

  Show description for dbebf3b
  commy2

  authored
  dbebf3b

  Copy full SHA for dbebf3b

• squash-CBA_fnc_addKeybind-redo (#656)

  commy2

  authored
  be38e50

  Copy full SHA for be38e50

• fix a script error

  commy2

  committed
  9c575ed

  Copy full SHA for 9c575ed

Commits on May 3, 2017

• Merge pull request #657 from CBATeam/keybinding-fix-script-error

  Show description for 5c7a661
  Killswitch00

  authored
  5c7a661

  Copy full SHA for 5c7a661

Commits on May 5, 2017

• Merge remote-tracking branch 'origin' into keybinding

  commy2

  committed
  63c2df2

  Copy full SHA for 63c2df2

Commits on May 7, 2017

• Merge remote-tracking branch 'origin/master' into keybinding

  commy2

  committed
  c933a2c

  Copy full SHA for c933a2c

• Merge remote-tracking branch 'origin/master' into keybinding

  commy2

  committed
  9aaaefe

  Copy full SHA for 9aaaefe

Commits on May 8, 2017

• add function to translate keys

  commy2

  committed
  1d35820

  Copy full SHA for 1d35820

Commits on May 11, 2017

• joinString

  commy2

  committed
  b1b61c5

  Copy full SHA for b1b61c5

• fix rebinding would delete default keyup handler

  commy2

  committed
  a7665aa

  Copy full SHA for a7665aa

• CfgFunctions

  commy2

  committed
  54e8ea4

  Copy full SHA for 54e8ea4

Commits on May 13, 2017

• Merge pull request #677 from CBATeam/keybinding-fix-rebind

  Show description for 17d02fc
  Killswitch00

  authored
  17d02fc

  Copy full SHA for 17d02fc

• Merge pull request #673 from CBATeam/localizeKey

  Show description for ec5a3cb
  Killswitch00

  authored
  ec5a3cb

  Copy full SHA for ec5a3cb

• Merge branch 'localizeKey' into keybinding

  commy2

  committed
  ffb8149

  Copy full SHA for ffb8149

• Merge remote-tracking branch 'origin/master' into keybinding

  commy2

  committed
  e19197c

  Copy full SHA for e19197c

• display multiple keybinds in diary

  commy2

  committed
  b3fbdda

  Copy full SHA for b3fbdda

• fix for travis

  commy2

  committed
  f91844f

  Copy full SHA for f91844f

Commits on May 17, 2017

• Merge pull request #679 from CBATeam/keybinding-help-multiple-binds

  Show description for f390cbe
  Killswitch00

  authored
  f390cbe

  Copy full SHA for f390cbe

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

  Show description for 648db8c
  commy2

  authored
  648db8c

  Copy full SHA for 648db8c

• Merge remote-tracking branch 'origin/master' into keybinding

  commy2

  committed
  5aee479

  Copy full SHA for 5aee479