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

New Mapping for the Numark N4 #1647

Closed
wants to merge 72 commits into from
Closed

New Mapping for the Numark N4 #1647

wants to merge 72 commits into from

Commits on Dec 29, 2017

  1. Merge remote-tracking branch 'upstream/2.1'

    @daschuer
    daschuer committed Dec 29, 2017
    Configuration menu
    Copy the full SHA
    310e459 View commit details
    Browse the repository at this point in the history

Commits on Dec 31, 2017

  1. Happy New Year 2018!

    @sblaisot
    sblaisot committed Dec 31, 2017
    Configuration menu
    Copy the full SHA
    dbe8ad5 View commit details
    Browse the repository at this point in the history

  2. Merge pull request mixxxdj#1452 from sblaisot/master-2k18 

    Happy New Year 2018!
    @rryan
    rryan authored Dec 31, 2017
    Configuration menu
    Copy the full SHA
    b64305b View commit details
    Browse the repository at this point in the history

Commits on Jan 1, 2018

  1. remove NSIS files as we now have completely switched to wix

    @sblaisot
    sblaisot committed Jan 1, 2018
    Configuration menu
    Copy the full SHA
    a10f4f2 View commit details
    Browse the repository at this point in the history

  2. also remove nsis patch

    @sblaisot
    sblaisot committed Jan 1, 2018
    Configuration menu
    Copy the full SHA
    3b73e0d View commit details
    Browse the repository at this point in the history

  3. properly update LICENCE and README.md for 2.2

    @sblaisot
    sblaisot committed Jan 1, 2018
    Configuration menu
    Copy the full SHA
    65799fb View commit details
    Browse the repository at this point in the history

  4. Remove visual studio version from LICENCE

    @sblaisot
    sblaisot committed Jan 1, 2018
    Configuration menu
    Copy the full SHA
    41e1843 View commit details
    Browse the repository at this point in the history

  5. Merge pull request mixxxdj#1456 from sblaisot/master-readme-update 

    properly update LICENCE and README.md for 2.2
    @Be-ing
    Be-ing authored Jan 1, 2018
    Configuration menu
    Copy the full SHA
    fc2906f View commit details
    Browse the repository at this point in the history

Commits on Jan 2, 2018

  1. Merge branch '2.1'

    @rryan
    rryan committed Jan 2, 2018
    Configuration menu
    Copy the full SHA
    ae3f81e View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/2.1'

    @Be-ing
    Be-ing committed Jan 2, 2018
    Configuration menu
    Copy the full SHA
    1db89c9 View commit details
    Browse the repository at this point in the history

Commits on Jan 6, 2018

  1. Merge pull request mixxxdj#1455 from sblaisot/remove_nsis 

    Remove NSIS files as we now have completely switched to wix
    @Be-ing
    Be-ing authored Jan 6, 2018
    Configuration menu
    Copy the full SHA
    9e10050 View commit details
    Browse the repository at this point in the history

  2. Merge branch '2.1'

    @rryan
    rryan committed Jan 6, 2018
    Configuration menu
    Copy the full SHA
    c8e4eee View commit details
    Browse the repository at this point in the history

Commits on Jan 14, 2018

  1. Merge remote-tracking branch 'upstream/2.1'

    @daschuer
    daschuer committed Jan 14, 2018
    Configuration menu
    Copy the full SHA
    b836fcd View commit details
    Browse the repository at this point in the history

Commits on Jan 21, 2018

  1. Merge remote-tracking branch 'upstream/2.1'

    @daschuer
    daschuer committed Jan 21, 2018
    Configuration menu
    Copy the full SHA
    d2ff6f4 View commit details
    Browse the repository at this point in the history

Commits on Jan 27, 2018

  1. Decrease Reverb Decay

    @ferranpujolcamins
    ferranpujolcamins committed Jan 27, 2018
    Configuration menu
    Copy the full SHA
    c642dc8 View commit details
    Browse the repository at this point in the history

Commits on Feb 3, 2018

  1. Fix crash when parsing bad xml controller file

    @johanLsp
    johanLsp committed Feb 3, 2018
    Configuration menu
    Copy the full SHA
    457f621 View commit details
    Browse the repository at this point in the history

  2. Add error dialog

    @johanLsp
    johanLsp committed Feb 3, 2018
    Configuration menu
    Copy the full SHA
    70b6c95 View commit details
    Browse the repository at this point in the history

  3. Merge pull request mixxxdj#1502 from ferranpujolcamins/Decrease-Rever… 

    …b-Decay

Decrease Reverb Decay
    @Be-ing
    Be-ing authored Feb 3, 2018
    Configuration menu
    Copy the full SHA
    0791f57 View commit details
    Browse the repository at this point in the history

Commits on Feb 4, 2018

  1. Fix deck state when loading empty track

    @johanLsp
    johanLsp committed Feb 4, 2018
    Configuration menu
    Copy the full SHA
    449871a View commit details
    Browse the repository at this point in the history

  2. Merge pull request mixxxdj#1507 from johanLsp/lp1746325_play_empty_deck 

    lp1746325 : Fix empty deck can be played
    @daschuer
    daschuer authored Feb 4, 2018
    Configuration menu
    Copy the full SHA
    5667a0d View commit details
    Browse the repository at this point in the history

Commits on Feb 6, 2018

  1. + Korg Kaoss DJ XML / JS mappings

    @larromba
    larromba committed Feb 6, 2018
    Configuration menu
    Copy the full SHA
    060974c View commit details
    Browse the repository at this point in the history

  2. fix: MIDI OUT bug with Mac OS 10.12 & Korg Kaoss DJ 1.6

    @larromba
    larromba committed Feb 6, 2018
    Configuration menu
    Copy the full SHA
    02a7028 View commit details
    Browse the repository at this point in the history

  3. fix: beatgrid move bug

    @larromba
    larromba committed Feb 6, 2018
    Configuration menu
    Copy the full SHA
    a24cfec View commit details
    Browse the repository at this point in the history

Commits on Feb 10, 2018

  1. Revert "Add error dialog" 

    This reverts commit 70b6c95.
    @johanLsp
    johanLsp committed Feb 10, 2018
    Configuration menu
    Copy the full SHA
    046863d View commit details
    Browse the repository at this point in the history

Commits on Feb 11, 2018

  1. Merge pull request mixxxdj#1506 from johanLsp/lp1689014_xmlparser 

    lp1689014 : Fix crash when parsing bad xml controller file
    @daschuer
    daschuer authored Feb 11, 2018
    Configuration menu
    Copy the full SHA
    4f1e083 View commit details
    Browse the repository at this point in the history

Commits on Feb 13, 2018

  1. added Fx functionality 

    When Fx button left is enabled, touchpad can be used to change FX1 rack
mix volume.

When Fx button right is enabled, touchpad can be used to change FX2
rack mix volume.
    @larromba
    larromba committed Feb 13, 2018
    Configuration menu
    Copy the full SHA
    8f1b5b0 View commit details
    Browse the repository at this point in the history

  2. Fx rack mix set to 0 on touch up (mimicking serato dj intro)

    @larromba
    larromba committed Feb 13, 2018
    Configuration menu
    Copy the full SHA
    da93be0 View commit details
    Browse the repository at this point in the history

Commits on Feb 19, 2018

  1. Merge remote-tracking branch 'upstream/2.1'

    @daschuer
    daschuer committed Feb 19, 2018
    Configuration menu
    Copy the full SHA
    231132e View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2018

  1. Shift+Filter can control either FX4 or channel gain

    NTMusic committed Feb 27, 2018
    Configuration menu
    Copy the full SHA
    05c55a4 View commit details
    Browse the repository at this point in the history

  2. ShiftFilterFX4 default value set to true

    NTMusic committed Feb 27, 2018
    Configuration menu
    Copy the full SHA
    762b70a View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2018

  1. Merge remote-tracking branch 'upstream/2.1'

    @daschuer
    daschuer committed Mar 3, 2018
    Configuration menu
    Copy the full SHA
    12da5a5 View commit details
    Browse the repository at this point in the history

Commits on Mar 8, 2018

  1. Merge pull request mixxxdj#1528 from nttmusic/mixtrack3 

    Numark Mixtrack 3 - Shift+Filter can control either FX4 or channel gain
    @Be-ing
    Be-ing authored Mar 8, 2018
    Configuration menu
    Copy the full SHA
    3c2f8c7 View commit details
    Browse the repository at this point in the history

Commits on Mar 18, 2018

  1. remove outdated comment

    @Be-ing
    Be-ing committed Mar 18, 2018
    Configuration menu
    Copy the full SHA
    c6aad08 View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2018

  1. Merge remote-tracking branch 'upstream/2.1'

    @daschuer
    daschuer committed Mar 20, 2018
    Configuration menu
    Copy the full SHA
    077fa71 View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2018

  1. Fix library select knobs that pass through their values directly 

    Create a new ControlObject type for this kind of unfiltered midi-to-value control.
    @ywwg
    ywwg committed Mar 21, 2018
    Configuration menu
    Copy the full SHA
    ac1c084 View commit details
    Browse the repository at this point in the history

  2. Rename direct control object to Encoder 

    also update a couple more examples of this use of COs
    @ywwg
    ywwg committed Mar 21, 2018
    Configuration menu
    Copy the full SHA
    8ab177d View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2018

  1. Merge pull request mixxxdj#1546 from ywwg/select-knob-fix 

    Fix library select knobs that pass through their values directly
    @daschuer
    daschuer authored Mar 22, 2018
    Configuration menu
    Copy the full SHA
    cba2e3b View commit details
    Browse the repository at this point in the history

  2. Merge branch '2.1'

    @daschuer
    daschuer committed Mar 22, 2018
    Configuration menu
    Copy the full SHA
    28a6781 View commit details
    Browse the repository at this point in the history

  3. half finished sketch for a better Numark N4 mappping

    Swiftb0y committed Mar 22, 2018
    Configuration menu
    Copy the full SHA
    4d59f25 View commit details
    Browse the repository at this point in the history

Commits on Mar 23, 2018

  1. A&H Xone K2/K1: map loop_in and loop_out with supershift mode 

    loop_in & loop_out do not require showing any state on the LEDs, so
they work well for supershift mode.
    @Be-ing
    Be-ing committed Mar 23, 2018
    Configuration menu
    Copy the full SHA
    5136980 View commit details
    Browse the repository at this point in the history

Commits on Mar 25, 2018

  1. A&H Xone K2/K1: add mode to control all parameters of 1 effect unit 

    accessed by pressing the Layer button of the 4 effect unit layouts
    @Be-ing
    Be-ing committed Mar 25, 2018
    Configuration menu
    Copy the full SHA
    987520e View commit details
    Browse the repository at this point in the history

Commits on Mar 26, 2018

  1. Components: fix bug with effect selection for some controllers 

    ... that do not have a way to query the controller on startup for the
position of all the knobs.
    @Be-ing
    Be-ing committed Mar 26, 2018
    Configuration menu
    Copy the full SHA
    fda04f7 View commit details
    Browse the repository at this point in the history

  2. A&H Xone K2/K1: use shift + knob turn for effect selection 

    when a single effect unit is focused. Any of the knobs for the effect
parameters can be used.
    @Be-ing
    Be-ing committed Mar 26, 2018
    Configuration menu
    Copy the full SHA
    4badfae View commit details
    Browse the repository at this point in the history

  3. A&H Xone K2/K1: map master and headphones effect routing buttons 

    These replace the deck 3 & 4 buttons for 2 deck layouts. For the 4
effect unit layouts, the master and headphone routing buttons are
accessible with shift.
    @Be-ing
    Be-ing committed Mar 26, 2018
    Configuration menu
    Copy the full SHA
    5feb171 View commit details
    Browse the repository at this point in the history

Commits on Mar 30, 2018

  1. A&H Xone K2/K1: rename files to match conventions

    @Be-ing
    Be-ing committed Mar 30, 2018
    Configuration menu
    Copy the full SHA
    b097ac1 View commit details
    Browse the repository at this point in the history

  2. A&H Xone K2/K1: swap beatjumping and loop halve/double functions 

    In my experience accessing beatjumping quickly is more important
than quickly adjusting the loop size.
    @Be-ing
    Be-ing committed Mar 30, 2018
    Configuration menu
    Copy the full SHA
    596e9ea View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'upstream/2.1' 

    Conflicts:
	LICENSE
    @daschuer
    daschuer committed Mar 30, 2018
    Configuration menu
    Copy the full SHA
    c1f452e View commit details
    Browse the repository at this point in the history

Commits on Apr 1, 2018

  1. added xml mapping

    Swiftb0y committed Apr 1, 2018
    Configuration menu
    Copy the full SHA
    b9ea00a View commit details
    Browse the repository at this point in the history

Commits on Apr 2, 2018

  1. Merge remote-tracking branch 'upstream/2.1'

    @Be-ing
    Be-ing committed Apr 2, 2018
    Configuration menu
    Copy the full SHA
    3513b67 View commit details
    Browse the repository at this point in the history

  2. touchpad x & y axis

    @larromba
    larromba committed Apr 2, 2018
    Configuration menu
    Copy the full SHA
    155a520 View commit details
    Browse the repository at this point in the history

  3. const -> var

    @larromba
    larromba committed Apr 2, 2018
    Configuration menu
    Copy the full SHA
    86baf72 View commit details
    Browse the repository at this point in the history

  4. cue_cdj -> cue_gotoandplay

    @larromba
    larromba committed Apr 2, 2018
    Configuration menu
    Copy the full SHA
    3086e6c View commit details
    Browse the repository at this point in the history

  5. fix: variable declared as empty function

    @larromba
    larromba committed Apr 2, 2018
    Configuration menu
    Copy the full SHA
    b96a5ff View commit details
    Browse the repository at this point in the history

Commits on Apr 3, 2018

  1. Merge pull request mixxxdj#1509 from larromba/feature/korgKaossDJ 

    Feature/korg kaoss dj
    @Be-ing
    Be-ing authored Apr 3, 2018
    Configuration menu
    Copy the full SHA
    72122f0 View commit details
    Browse the repository at this point in the history

  2. Merge pull request mixxxdj#1554 from Be-ing/xone_k2 

    Allen & Heath Xone K2/K1 mapping part 2
    @Be-ing
    Be-ing authored Apr 3, 2018
    Configuration menu
    Copy the full SHA
    5fc314e View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2018

  1. Merge remote-tracking branch 'upstream/2.1'

    @daschuer
    daschuer committed Apr 5, 2018
    Configuration menu
    Copy the full SHA
    d385696 View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2018

  1. Merge remote-tracking branch 'upstream/2.1'

    @Be-ing
    Be-ing committed Apr 6, 2018
    Configuration menu
    Copy the full SHA
    4ab5119 View commit details
    Browse the repository at this point in the history

Commits on Apr 7, 2018

  1. Merge remote-tracking branch 'upstream/2.1'

    @Be-ing
    Be-ing committed Apr 7, 2018
    Configuration menu
    Copy the full SHA
    b14b2ac View commit details
    Browse the repository at this point in the history

Commits on Apr 10, 2018

  1. bpmSlider is now handled in script; inverting bug persists.

    Swiftb0y committed Apr 10, 2018
    Configuration menu
    Copy the full SHA
    58a065b View commit details
    Browse the repository at this point in the history

Commits on Apr 14, 2018

  1. commit for merging mixxx 2.1

    Swiftb0y committed Apr 14, 2018
    Configuration menu
    Copy the full SHA
    038313c View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into N4v2

    Swiftb0y committed Apr 14, 2018
    Configuration menu
    Copy the full SHA
    ab6dc3d View commit details
    Browse the repository at this point in the history

Commits on Apr 21, 2018

  1. working commit, some bugfixing still required

    Swiftb0y committed Apr 21, 2018
    Configuration menu
    Copy the full SHA
    ddae75e View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2018

  1. add sysEx sync on startup and pflVuMeter prototype

    Swiftb0y committed Apr 22, 2018
    Configuration menu
    Copy the full SHA
    12c53d7 View commit details
    Browse the repository at this point in the history

Commits on Apr 25, 2018

  1. working commit, finished; may need some testing.

    Swiftb0y committed Apr 25, 2018
    Configuration menu
    Copy the full SHA
    3f7f90d View commit details
    Browse the repository at this point in the history

  2. added basic shutoff; removed debug prints; added channelindicator lights

    Swiftb0y committed Apr 25, 2018
    Configuration menu
    Copy the full SHA
    e73d9d1 View commit details
    Browse the repository at this point in the history

  3. removed outdated mappings

    Swiftb0y committed Apr 25, 2018
    Configuration menu
    Copy the full SHA
    a34bd4a View commit details
    Browse the repository at this point in the history

Commits on Apr 26, 2018

  1. fixed missing comma @222:98

    Swiftb0y committed Apr 26, 2018
    Configuration menu
    Copy the full SHA
    d52f58c View commit details
    Browse the repository at this point in the history

Commits on Apr 27, 2018

  1. added configurable option for cueBtn reverse roll on shift.

    Swiftb0y committed Apr 27, 2018
    Configuration menu
    Copy the full SHA
    15568d7 View commit details
    Browse the repository at this point in the history

  2. function based input methods now component based; removed dead code;

    Swiftb0y committed Apr 27, 2018
    Configuration menu
    Copy the full SHA
    1bd341b View commit details
    Browse the repository at this point in the history

  3. removed keylockbtn quantize function since handled by SyncButton.shift

    Swiftb0y committed Apr 27, 2018
    Configuration menu
    Copy the full SHA
    a15950b View commit details
    Browse the repository at this point in the history

  4. fixed bpmslider direction to match with controller: Down speeds up.

    Swiftb0y committed Apr 27, 2018
    Configuration menu
    Copy the full SHA
    f397adc View commit details
    Browse the repository at this point in the history

  5. fixed missing } and ; Swapped Maximize Library and GoToItem; init output

    Swiftb0y committed Apr 27, 2018
    Configuration menu
    Copy the full SHA
    1310b35 View commit details
    Browse the repository at this point in the history