Code

Traktor s3 2.3#3031

Code

Merged

Be-ing merged 103 commits intomixxxdj:2.3mixxxdj/mixxx:2.3from ywwg:traktor-s3-2.3ywwg/mixxx:traktor-s3-2.3Copy head branch name to clipboardFeb 16, 2021

+2,291-1

Commits

Commits on Jul 24, 2020

• Traktor S3: Initial commit

  Show description for ba6304a
  ywwg

  committed
  ba6304a

  Copy full SHA for ba6304a

Commits on Jul 26, 2020

• Traktor S3: move from channel-specific to deck aliases

  Show description for df87b97
  ywwg

  committed
  df87b97

  Copy full SHA for df87b97

Commits on Jul 27, 2020

• HidController: loop until no more messages are available on poll

  Show description for 297537a
  Be-ing

  committed
  297537a

  Copy full SHA for 297537a

• HidController: do not copy incoming data before processing it

  Be-ing

  committed
  1ac6500

  Copy full SHA for 1ac6500

Commits on Jul 31, 2020

• Merge branch '2.3' into traktor-s3-2.3

  ywwg

  committed
  5c49335

  Copy full SHA for 5c49335

• Traktor S3: Fix most connections for deck switching

  ywwg

  committed
  6fcecb5

  Copy full SHA for 6fcecb5

Commits on Aug 1, 2020

• Traktor S3: Bind more of the library buttons

  ywwg

  committed
  7563f01

  Copy full SHA for 7563f01

Commits on Aug 2, 2020

• Traktor S3: Master Vus, start implementing color lights

  ywwg

  committed
  873eb53

  Copy full SHA for 873eb53

• Traktor S3: Lights behaving better, still a ways to go

  ywwg

  committed
  7d7dbf7

  Copy full SHA for 7d7dbf7

• Merge remote-tracking branch 'upstream/2.3' into hid_polling

  Be-ing

  committed
  28f2a24

  Copy full SHA for 28f2a24

• HidController: filter redundant messages

  Be-ing

  committed
  dccade5

  Copy full SHA for dccade5

• Traktor S3: Try to get deck switching working

  ywwg

  committed
  ec872e5

  Copy full SHA for ec872e5

• ControllerManager: make kPollInterval a static member

  Show description for 1b0d65a
  Be-ing

  committed
  1b0d65a

  Copy full SHA for 1b0d65a

• HidController: stop polling when exceeding poll interval

  Show description for 73e6460
  Be-ing

  committed
  73e6460

  Copy full SHA for 73e6460

• HidController: clang-format #includes

  Be-ing

  committed
  759a0c2

  Copy full SHA for 759a0c2

Commits on Aug 3, 2020

• Traktor S3: good progress on lights

  ywwg

  committed
  f5f6501

  Copy full SHA for f5f6501

Commits on Aug 4, 2020

• Traktor S3: more lights

  ywwg

  committed
  adbcd3f

  Copy full SHA for adbcd3f

• Merge branch 'clone-deck-crash' into traktor-s3-2.3

  ywwg

  committed
  7b1d774

  Copy full SHA for 7b1d774

• Traktor S3: Fix color lights, add more

  ywwg

  committed
  76404cc

  Copy full SHA for 76404cc

• Traktor S3: configurable dim/bright color values

  ywwg

  committed
  907068e

  Copy full SHA for 907068e

Commits on Aug 5, 2020

• Traktor S3: pad buttons

  ywwg

  committed
  bce2fe8

  Copy full SHA for bce2fe8

• Traktor S3: light up the reverse light

  ywwg

  committed
  6bd797b

  Copy full SHA for 6bd797b

Commits on Aug 6, 2020

• Traktor S3: Most functions working decently

  ywwg

  committed
  ac58bc2

  Copy full SHA for ac58bc2

• Traktor S3: hotcue colors!

  ywwg

  committed
  520e942

  Copy full SHA for 520e942

Commits on Aug 9, 2020

• TraktorS3: fx buttons

  ywwg

  committed
  0a2d951

  Copy full SHA for 0a2d951

• Merge branch '2.3' into traktor-s3-2.3

  ywwg

  committed
  232516a

  Copy full SHA for 232516a

• Traktor S3: clean up lint problems

  ywwg

  committed
  29bb6e7

  Copy full SHA for 29bb6e7

• Traktor S3: fix jog wheels

  Show description for f496ede
  ywwg

  committed
  f496ede

  Copy full SHA for f496ede

• TraktorS3: revert mistake diffs

  ywwg

  committed
  d19b312

  Copy full SHA for d19b312

• Traktor S3: pitch slider relative mode

  ywwg

  committed
  e610604

  Copy full SHA for e610604

• Traktor S3: animate segments around wheels

  ywwg

  committed
  888d513

  Copy full SHA for 888d513

Commits on Aug 10, 2020

• Traktor S3: Major refactor to be more objecty

  ywwg

  committed
  69f35e1

  Copy full SHA for 69f35e1

• Traktor S3: refactor continues, outputs starting to work again

  ywwg

  committed
  a5def7e

  Copy full SHA for a5def7e

Commits on Aug 11, 2020

• Traktor S3: finish refactor!

  ywwg

  committed
  483dabd

  Copy full SHA for 483dabd

• Traktor S3: Fix some bugs. Pretty stable again

  ywwg

  committed
  2b76faa

  Copy full SHA for 2b76faa

• Traktor S3: better timers

  ywwg

  committed
  d009e3a

  Copy full SHA for d009e3a

Commits on Aug 17, 2020

• Traktor S3: more rearranging (untested)

  ywwg

  committed
  f1d3b12

  Copy full SHA for f1d3b12

• Merge branch '2.3' into traktor-s3-2.3

  ywwg

  committed
  e2deeb5

  Copy full SHA for e2deeb5

Commits on Aug 18, 2020

• Traktor S3: Make sure lights light up if triggered from gui, not just controller

  ywwg

  committed
  2f518b8

  Copy full SHA for 2f518b8

• Traktor S3: Fix hotcues

  Show description for f8ad615
  ywwg

  committed
  f8ad615

  Copy full SHA for f8ad615

Commits on Aug 19, 2020

• Traktor S3: revert colormapper changes

  ywwg

  committed
  7fe78b2

  Copy full SHA for 7fe78b2

• Traktor S3: Make debugmode a var

  ywwg

  committed
  4696655

  Copy full SHA for 4696655

• Traktor S3: enable soft takeover for quickeffect

  ywwg

  committed
  3de6d0b

  Copy full SHA for 3de6d0b

• Update res/controllers/Traktor-Kontrol-S3-hid-scripts.js

  Show description for f578866
  

  ywwg

  and

  Holzhaus

  authored
  f578866

  Copy full SHA for f578866

• Update res/controllers/Traktor-Kontrol-S3-hid-scripts.js

  Show description for d575a54
  

  ywwg

  and

  Holzhaus

  authored
  d575a54

  Copy full SHA for d575a54

• Traktor S3: notes

  ywwg

  committed
  946cdf6

  Copy full SHA for 946cdf6

• Update res/controllers/Traktor-Kontrol-S3-hid-scripts.js

  Show description for 4a9a2da
  

  ywwg

  and

  Holzhaus

  authored
  4a9a2da

  Copy full SHA for 4a9a2da

Commits on Aug 20, 2020

• Traktor S3: make user configs global

  ywwg

  committed
  8b849f4

  Copy full SHA for 8b849f4

• Traktor S3: make button brightnesses global too

  ywwg

  committed
  bb2394f

  Copy full SHA for bb2394f

• Traktor S3: Implement channel 4 input mode

  Show description for 2b8c817
  ywwg

  committed
  2b8c817

  Copy full SHA for 2b8c817

Commits on Aug 21, 2020

• Traktor S3: remove redundant connections

  ywwg

  committed
  05d6a99

  Copy full SHA for 05d6a99

• Traktor S3: FX for input channel

  ywwg

  committed
  0d70fe8

  Copy full SHA for 0d70fe8

• Traktor S3: fix keylock light and input fx

  Show description for 55e32a1
  ywwg

  committed
  55e32a1

  Copy full SHA for 55e32a1

Commits on Aug 23, 2020

• Traktor S3: toggle whole chain

  ywwg

  committed
  d89004d

  Copy full SHA for d89004d

Commits on Aug 24, 2020

• Traktor S3: batch light updates for less HID spamming

  Show description for ce52010
  ywwg

  committed
  ce52010

  Copy full SHA for ce52010

• Merge remote-tracking branch 'be/hid_polling' into traktor-s3-2.3

  ywwg

  committed
  3110dfc

  Copy full SHA for 3110dfc

Commits on Aug 27, 2020

• Traktor S3: Start rewriting fx mapping

  ywwg

  committed
  958cb70

  Copy full SHA for 958cb70

Commits on Aug 31, 2020

• Traktor S3: write a controller unit test!

  Show description for c9844c9
  ywwg

  committed
  c9844c9

  Copy full SHA for c9844c9

• Merge branch '2.3' into traktor-s3-2.3

  ywwg

  committed
  451a722

  Copy full SHA for 451a722

• Traktor S3: refactor testing, js testing works now

  ywwg

  committed
  daaf969

  Copy full SHA for daaf969

• Traktor S3: wip -- more effects reworking

  ywwg

  committed
  d31a797

  Copy full SHA for d31a797

Commits on Sep 1, 2020

• Traktor S3: add a test for enable/disable effect units per channel

  ywwg

  committed
  3f23819

  Copy full SHA for 3f23819

• TraktorS3: more effects mapping and testing

  ywwg

  committed
  d0fc61d

  Copy full SHA for d0fc61d

• Traktor S3: remove commented cruft

  ywwg

  committed
  c730525

  Copy full SHA for c730525

Commits on Sep 2, 2020

• Traktor S3: start testing lights

  ywwg

  committed
  9a2a924

  Copy full SHA for 9a2a924

• Traktor S3: more tests

  ywwg

  committed
  c7e34f3

  Copy full SHA for c7e34f3

Commits on Sep 3, 2020

• Traktor S3: tests pass!

  ywwg

  committed
  b507664

  Copy full SHA for b507664

• Traktor S3: Effects mapping mostly done

  Show description for 938c1ab
  ywwg

  committed
  938c1ab

  Copy full SHA for 938c1ab

• Traktor S3: debug cleanup

  ywwg

  committed
  d9fa36c

  Copy full SHA for d9fa36c

• revert unintentional changes

  ywwg

  committed
  a7ab2b3

  Copy full SHA for a7ab2b3

• another unintentional commit

  ywwg

  committed
  a0eeb51

  Copy full SHA for a0eeb51

Commits on Sep 23, 2020

• Merge branch '2.3' into traktor-s3-2.3

  ywwg

  committed
  4d01caf

  Copy full SHA for 4d01caf

• Traktor S3: Sync with master version

  ywwg

  committed
  81a0638

  Copy full SHA for 81a0638

• Traktor S3: revert test for 2.3

  ywwg

  committed
  8eff1eb

  Copy full SHA for 8eff1eb

• Traktor S3: revert formatting changes

  ywwg

  committed
  dd3bcaf

  Copy full SHA for dd3bcaf

Commits on Sep 26, 2020

• Merge branch '2.3' into traktor-s3-2.3

  ywwg

  committed
  5693f25

  Copy full SHA for 5693f25

Commits on Oct 2, 2020

• Traktor S3: make sure to bind callbacks

  ywwg

  committed
  3cef610

  Copy full SHA for 3cef610

Commits on Oct 3, 2020

• Traktor S3: Hook up jog button

  Show description for cd820b3
  ywwg

  committed
  cd820b3

  Copy full SHA for cd820b3

Commits on Oct 12, 2020

• Merge branch 'hid-poll-fix' into traktor-s3-2.3

  ywwg

  committed
  bd438fa

  Copy full SHA for bd438fa

• Traktor S3: Much better jog/scratch wheel behavior

  ywwg

  committed
  1b7a5ec

  Copy full SHA for 1b7a5ec

• Merge branch '2.3' into traktor-s3-2.3

  ywwg

  committed
  1d429e6

  Copy full SHA for 1d429e6

Commits on Nov 13, 2020

• Merge branch '2.3' into traktor-s3-2.3

  ywwg

  committed
  c2e2786

  Copy full SHA for c2e2786

Commits on Nov 17, 2020

• Traktor S3: Fix relative slider mode out of bounds issues

  ywwg

  committed
  e712bc7

  Copy full SHA for e712bc7

• Traktor S3: Update wiki link

  ywwg

  committed
  53514f7

  Copy full SHA for 53514f7

Commits on Nov 18, 2020

• Merge branch '2.3' into traktor-s3-2.3

  ywwg

  committed
  e72479b

  Copy full SHA for e72479b

Commits on Dec 7, 2020

• Update res/controllers/Traktor Kontrol S3.hid.xml

  Show description for 7d289f2
  

  ywwg

  and

  Holzhaus

  authored
  7d289f2

  Copy full SHA for 7d289f2

• Update res/controllers/Traktor-Kontrol-S3-hid-scripts.js

  Show description for 8f5636b
  

  ywwg

  and

  Holzhaus

  authored
  8f5636b

  Copy full SHA for 8f5636b

• Traktor S3: address notes

  ywwg

  committed
  1bc6bbd

  Copy full SHA for 1bc6bbd

• Merge branch 'traktor-s3-2.3' of github.com:ywwg/mixxx into traktor-s3-2.3

  ywwg

  committed
  03383f3

  Copy full SHA for 03383f3

Commits on Dec 12, 2020

• Merge remote-tracking branch 'mixxx/2.3' into traktor-s3-2.3

  ywwg

  committed
  e7f22e9

  Copy full SHA for e7f22e9

• Update res/controllers/Traktor-Kontrol-S3-hid-scripts.js

  Show description for d44ec2c
  

  ywwg

  and

  Be-ing

  authored
  d44ec2c

  Copy full SHA for d44ec2c

• Traktor S3: address notes

  ywwg

  committed
  85e219e

  Copy full SHA for 85e219e

• Merge remote-tracking branch 'origin/traktor-s3-2.3' into traktor-s3-2.3

  ywwg

  committed
  fc41283

  Copy full SHA for fc41283

• Apply suggestions from code review

  Show description for e3603d6
  

  ywwg

  and

  Be-ing

  authored
  e3603d6

  Copy full SHA for e3603d6

• Merge remote-tracking branch 'origin/traktor-s3-2.3' into traktor-s3-2.3

  ywwg

  committed
  4929483

  Copy full SHA for 4929483

Commits on Jan 30, 2021

• Merge branch '2.3' into traktor-s3-2.3

  ywwg

  committed
  754d406

  Copy full SHA for 754d406

Commits on Jan 31, 2021

• Traktor S3: Create options for different sampler playback modes

  ywwg

  committed
  52a8565

  Copy full SHA for 52a8565

• Traktor S3: Make JOG button work like it does for other controllers

  ywwg

  committed
  4d84f71

  Copy full SHA for 4d84f71

Commits on Feb 6, 2021

• Traktor S3: simplify shutdown

  ywwg

  committed
  01f9281

  Copy full SHA for 01f9281

• Traktor S3: Small updates:

  Show description for 9c0adea
  ywwg

  committed
  9c0adea

  Copy full SHA for 9c0adea

Commits on Feb 7, 2021

• Traktor S3: remap "view" to maximize_library, and playlist button to move focus

  ywwg

  committed
  40b6799

  Copy full SHA for 40b6799

Commits on Feb 15, 2021

• Merge branch '2.3' into traktor-s3-2.3

  ywwg

  committed
  4b90253

  Copy full SHA for 4b90253

• Traktor S3: Fix so jog button toggles wheel touch mode

  ywwg

  committed
  31e896f

  Copy full SHA for 31e896f