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

Clean application of master_sync patch #2

Closed
wants to merge 18 commits into from
Closed

Clean application of master_sync patch #2

wants to merge 18 commits into from

Commits on May 21, 2013

  1. Clean patch for master_sync

    @ywwg
    ywwg committed May 21, 2013
    Configuration menu
    Copy the full SHA
    b087abe View commit details
    Browse the repository at this point in the history

  2. Respond to review notes.

    @ywwg
    ywwg committed May 21, 2013
    Configuration menu
    Copy the full SHA
    39f96a6 View commit details
    Browse the repository at this point in the history

  3. possibly wrong fix for locking issue, remove script since it always c… 

    …hanges

Conflicts:
	mixxx/res/controllers/Xone-K2-scripts.js
    @ywwg
    ywwg committed May 21, 2013
    Configuration menu
    Copy the full SHA
    d8995b5 View commit details
    Browse the repository at this point in the history

  4. include high dpi skins

    @ywwg
    ywwg committed May 21, 2013
    Configuration menu
    Copy the full SHA
    d4e4c7b View commit details
    Browse the repository at this point in the history

Commits on May 23, 2013

  1. Merge branch 'master' into master_sync_clean 

    Conflicts:
	mixxx/src/dlgprefvinyl.cpp
	mixxx/src/mixxx.cpp
	mixxx/src/vinylcontrol/vinylcontrolmanager.cpp
    @ywwg
    ywwg committed May 23, 2013
    Configuration menu
    Copy the full SHA
    ad8908e View commit details
    Browse the repository at this point in the history

  2. Add decks three and four to vc manager

    @ywwg
    ywwg committed May 23, 2013
    Configuration menu
    Copy the full SHA
    b64ea59 View commit details
    Browse the repository at this point in the history

  3. should be zero-based

    @ywwg
    ywwg committed May 23, 2013
    Configuration menu
    Copy the full SHA
    e5995be View commit details
    Browse the repository at this point in the history

  4. add all four decks

    @ywwg
    ywwg committed May 23, 2013
    Configuration menu
    Copy the full SHA
    0965372 View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2013

  1. Merge branch 'master' into master_sync_clean

    @ywwg
    ywwg committed Jun 3, 2013
    Configuration menu
    Copy the full SHA
    238b68c View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2013

  1. Merge branch 'master' into master_sync_clean

    @ywwg
    ywwg committed Jun 5, 2013
    Configuration menu
    Copy the full SHA
    10dd42c View commit details
    Browse the repository at this point in the history

  2. no, maximum vinyl inputs 4!

    @ywwg
    ywwg committed Jun 5, 2013
    Configuration menu
    Copy the full SHA
    3ad9c08 View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2013

  1. Merge branch 'master' into master_sync_clean 

    Conflicts:
	mixxx/src/engine/bpmcontrol.cpp
	mixxx/src/engine/enginebuffer.cpp
    @ywwg
    ywwg committed Jun 8, 2013
    Configuration menu
    Copy the full SHA
    4ed33de View commit details
    Browse the repository at this point in the history

  2. Fixes for master/slave lights not behaving

    @ywwg
    ywwg committed Jun 8, 2013
    Configuration menu
    Copy the full SHA
    75f595b View commit details
    Browse the repository at this point in the history

  3. Fix midi lights not staying in sync 

    Change xone configuration for master sync mode
    @ywwg
    ywwg committed Jun 8, 2013
    Configuration menu
    Copy the full SHA
    a1114df View commit details
    Browse the repository at this point in the history

  4. Fix vinyl input toggling not working correctly

    @ywwg
    ywwg committed Jun 8, 2013
    Configuration menu
    Copy the full SHA
    4d294d2 View commit details
    Browse the repository at this point in the history

  5. Implement optional validation of control object changes.

    @ywwg
    ywwg committed Jun 8, 2013
    Configuration menu
    Copy the full SHA
    d1c9bd8 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'covalidation' into master_sync_clean

    @ywwg
    ywwg committed Jun 8, 2013
    Configuration menu
    Copy the full SHA
    b7a7e5d View commit details
    Browse the repository at this point in the history

  7. doesn't work. validation needs to be in the private control object

    @ywwg
    ywwg committed Jun 8, 2013
    Configuration menu
    Copy the full SHA
    dd4a10e View commit details
    Browse the repository at this point in the history