Resolve merge conflicts for MIDI clock output PR 702#11

Merged

ywwg merged 10000 commits into

ywwg:midi-masterfrom

Holzhaus:midi-clock-input

Feb 7, 2021

This pull request is big! We're only showing the most recent 250 commits

Commits on Jan 16, 2021

Commits on Jan 21, 2021

Commits on Jan 22, 2021

Commits on Jan 24, 2021

Commits on Jan 25, 2021

Commits on Jan 26, 2021

Commits on Jan 27, 2021

Commits on Jan 29, 2021

Merge pull request #3605 from daschuer/internalshout
uklotzde
authored

Commits on Jan 30, 2021

Merge remote-tracking branch 'upstream/2.2' into pioneer-ddj-400-2

Holzhaus
authored and
Justin Kourie
committed
Pioneer DDJ-400: Auto-fix eslint issues

Holzhaus
authored and
Justin Kourie
committed
Pioneer DDJ-400: Use function expressions instead of declarations

Holzhaus
authored and
Justin Kourie
committed
Merge pull request #1 from Holzhaus/pioneer-ddj-400-2

nschloe
authored and
Justin Kourie
committed
make sure the beatloop buttons don't turn off at shift

nschloe
authored and
Justin Kourie
committed
fix startup warning

nschloe
authored and
Justin Kourie
committed
pioneer ddj-400: remove sample flickers

nschloe
authored and
Justin Kourie
committed
Set highspeedScale to 20, to allow quick search through track using SHIFT+JOGWHEEL

dj3730
authored and
Justin Kourie
committed
pioneer ddj-400: update descr for some fields

nschloe
authored and
Justin Kourie
committed
Updates to comments

dj3730
authored and
Justin Kourie
committed
fixes small bug spotted by @dj3730

nschloe
authored and
Justin Kourie
committed
correction to highspeedScale factor

dj3730
authored and
Justin Kourie
committed
ddj-400: better commenting

nschloe
authored and
Justin Kourie
committed
fixes a problem with samplerPlayOutputCallbackFunction, for some reason, using script.samplerRegEx here results in an error under Linux

dj3730
authored and
Justin Kourie
committed
DDJ-400: script control of rate sliders to correct behavior

dj3730
authored and
Justin Kourie
committed
Implements changes to effect unit handling as requested by @Be-ing

dj3730
authored and
Justin Kourie
committed
ddj-400: better description for reloop_andstop

nschloe
authored and
Justin Kourie
committed
Added support for Track Loaded animations when track is loaded to a deck (and also at startup)

dj3730
authored and
Justin Kourie
committed
DDJ-400: Extends Sampler support to 16 samplers. Blinks sampler pads when a sample is playing (even if Shift is currently pressed). Ensure that sampler pad LED remains lit when sample ends or is…

dj3730
authored and
Justin Kourie
committed
Merge pull request #3 from dj3730/ddj400

nschloe
authored and
Justin Kourie
committed
small formatting fixes

dj3730
authored and
Justin Kourie
committed
Merge pull request #4 from dj3730/ddj400

nschloe
authored and
Justin Kourie
committed
Implement changes requested by Be-ing: Remove extraneous comments and whitespace. Replace engine.connectControl with engine.makeConnection. Removed lines which overrode user preferences for rate…

dj3730
authored and
Justin Kourie
committed
formatting fixes

dj3730
authored and
Justin Kourie
committed
Merge pull request #5 from dj3730/ddj400

nschloe
authored and
Justin Kourie
committed
Merge pull request #6 from dj3730/ddj400

nschloe
authored and
Justin Kourie
committed
trailing whitespace

nschloe
authored and
Justin Kourie
committed
some style fixes

nschloe
authored and
Justin Kourie
committed
more style

nschloe
authored and
Justin Kourie
committed
Refactors beatjump pad to use script bindings
Justin Kourie
committed
Replicates rekordbox's beatjump shift mode
Justin Kourie
committed
Replicates rekordbox's beatjump pad lighting in shift mode
Justin Kourie
committed
Removes auto 4 beat loop which does not work as expected
Justin Kourie
committed
Uses standard mixxx controls for looping in and out
Justin Kourie
committed
Turns loop button lights on at startup and off at exit
Justin Kourie
committed
Implements loop adjust feature using shift mode
Justin Kourie
committed
Implements loop button light states
Justin Kourie
committed
Allows changing effects on the currently selected unit
Justin Kourie
committed
Adds soft takeover to Level/Depth knob
Justin Kourie
committed
Ensures FX light is cleared on exit
Justin Kourie
committed
Removes CUE/LOOP CALL "memory" cue point scrolling
Justin Kourie
committed
Adds phrase jump forward & back
Justin Kourie
committed
Refactors sampler code
Justin Kourie
committed
Standardizes function expressions (by removing nonstandard helper)
Justin Kourie
committed
Makes nonstandard global variable an attribute of the PioneerDDJ400 object
Justin Kourie
committed
Removes stale PAD FX mappings
Justin Kourie
committed
Significantly tightens jogwheel beat nudging
Justin Kourie
committed
Adds quantize toggle to unused mapping
Justin Kourie
committed
Removes duplicate code & update sampler descriptions
Justin Kourie
committed
Fixes code style issues
Justin Kourie
committed
Ensures controller beat sync works the same as Mixxx interface
Justin Kourie
committed
Allows loop doubling/halving on disabled loops too
Justin Kourie
committed
Minor cosmetic restructuring
Justin Kourie
committed
Inverts the control logic on the Level/Depth knob
Justin Kourie
committed
No need to toggle focus on and off an effect anymore
Justin Kourie
committed
Unmaps master gain knob
Justin Kourie
committed
Removes experimental pad modes
Justin Kourie
committed
Final cosmetic restructuring
Justin Kourie
committed
Fixes FX channel switch
Justin Kourie
committed
Adds code style review suggestions
Justin Kourie
committed
Simplifies tempo slider calculation and adds note
Justin Kourie
committed
Simplifies track loaded callback
Justin Kourie
committed
Simplifies beat fx knob function
Justin Kourie
committed
Explains some controller idiosyncrasies
Justin Kourie
committed
Uses a variable to store the size of quick jumping
Justin Kourie
committed
Updates xml mapping
Justin Kourie
committed
Replaces sync_master with explicit enabling of sync_enabled (i.e., sync lock) on long press)
Justin Kourie
committed
Adds note explaining the upper/lower limits on beatjump size increasing/decreasing
Justin Kourie
committed
Improves effects implementation
Justin Kourie
committed
Updates beat sync implementation
Justin Kourie
committed
Ensures soft takeover on mix is retained when killing all FX
Justin Kourie
committed
Prevents redundant disabling of sync lock

authored and
Justin Kourie
committed
Simplifies beatjump pad lighting
Justin Kourie
committed
Removes unneeded shift binding
Justin Kourie
committed
Removes unneeded output mapping
Justin Kourie
committed
Cleans up unneeded comments
Justin Kourie
committed
Uses shift to toggle meta/mix mapping on Level/Depth knob
Justin Kourie
committed
Retains FX light state when shift is pressed
Justin Kourie
committed
Makes jogwheel nudging slightly less sensitive
Justin Kourie
committed
Adds <manual> tag to the mapping
Justin Kourie
committed

Commits on Jan 31, 2021

Commits on Feb 1, 2021

Commits on Feb 2, 2021

Commits on Feb 4, 2021

Commits on Feb 5, 2021

Commits on Feb 6, 2021

Merge branch '2.3' of git@github.com:mixxxdj/mixxx.git into main
uklotzde
committed

Commits on Feb 7, 2021

Merge branch 'midi-master' of https://github.com/ywwg/mixxx into midi-clock-input
Holzhaus
committed