Merge branch #1
Merged
Merge branch #1
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# Conflicts: # .travis.yml # CMakeLists.txt # src/core/Track.cpp
ryuukumar
pushed a commit
that referenced
this pull request
Jul 10, 2020
author Hussam al-Homsi <sawuare@gmail.com> 1591749945 -0400 committer adi <adityakumar4644@gmail.com> 1594357752 +0530 parent a053061 author Hussam al-Homsi <sawuare@gmail.com> 1591749945 -0400 committer adi <adityakumar4644@gmail.com> 1594357492 +0530 Remove macros likely() and unlikely() (LMMS#5530) * Remove macros likely() and unlikely(): LMMS#5530 * Remove only use of macro Q_UNLIKELY(): LMMS#5530 Adds a button to clone the BB track pattern Adds a button on the BBEditor that clones the current BB track pattern, but without also cloning the song editor TCOs. That can be useful when an user is editing drumlines and wants to make a section with a slight variation for example. Changes the clone pattern method name - Changes method name from cloneBBTrackPattern to clonePattern - Small fix on the comments - Adds a TODO comment regarding reusing the code from TrackOperationsWidget as a reference, so we can later figure out a way to not repeat the code Make better use of getSelectedNotes() in PianoRoll.cpp (LMMS#5526) * Make better use of getSelectedNotes() in PianoRoll.cpp * Save and reuse selected note vector more often * Apply review suggestions Thanks to @Veratil * Comment, style, consistency Automatically assign a midi input device to the selected track (LMMS#5499) src/gui/editors/SongEditor.cpp Gradient can be toggled and color can be changed. Made playback line (and tail) transparent to mouse clicks Gradient disappears when paused/stopped; tail length depends on zoom Fixes bug where gradient appears when a pattern is played; style corrections Cleaned up code Rename m_zoomLevels to s_zoomLevels Finalising code Make positionLine class independent of parent zooming model Edit a bug fix to make it more efficient Rename m_x and finalise positionLine code Rename m_x and finalise positionLine changes Rename X to playHeadPos Hotkey Shift+Space for pausing Fix git inconsistensies Blank commit to fix changes Changed to use Song::togglePause() Move shortucut to Editor.cpp to make it work across editors Update LcdSpinBox.cpp (LMMS#5555) Fix some TCOs not saving properly (LMMS#5537) Travis: stop auto-uploading binary releases Update CONTRIBUTORS Add a CMake option for deploying Qt translations Update PROJECT_YEAR Bump version to 1.2.2 Fix a bug on the "Remove unused channels" command (LMMS#5559) On the FX mixer, the "Remove unused channels" action only checked for InstrumentTracks on every channel but ignored SampleTracks that could be linked to the particular FX channel. Because of that, if there was a channel where only SampleTracks are forwarded to and we clicked on "Remove unused channels", it was going to be removed. This commit fixes it. Make "Change Color" a track-wide setting for all tracks Rebase #2 (#3) * Refactor deleteUnusedChannels in FxMixerView (LMMS#5564) * Refactor deleteUnusedChannels in FxMixerView * Comments + style fix Co-authored-by: Veratil <veratil@gmail.com>, formatting, suggestions on which lines to comment. Co-authored-by: Kevin Zander <veratil@gmail.com> * Update weird deleteChannel loop * Use vector instead of array Co-authored-by: Dominic Clark <mrdomclark@gmail.com> Co-authored-by: Kevin Zander <veratil@gmail.com> Co-authored-by: Dominic Clark <mrdomclark@gmail.com> * Better minimum length when resizing notes (LMMS#5512) * Limit note length to quantization value Draging a note to it's minimum value of 1 will add this new length to the note if you later choose to stretch it which will not be clearly visible in the Piano Roll unless you zoom in a bit. Limit the note length to the quantization value and use <Alt> key to override and set a smaller value. * Update src/gui/editors/PianoRoll.cpp Co-authored-by: Spekular <Spekular@users.noreply.github.com> * Remember min note length if shorter than quantization() * Find note length modulo quantization, pick smallest from selected notes * Comment on and improve m_minResizeLen calculation Co-authored-by: Oskar Wallgren <oskar.wallgren13@gmail.com> Co-authored-by: Spekular <Spekular@users.noreply.github.com> Co-authored-by: Kevin Zander <veratil@gmail.com> Co-authored-by: Dominic Clark <mrdomclark@gmail.com> Co-authored-by: Oskar Wallgren <oskar.wallgren13@gmail.com> Enable reset color to default Merge branch (#1) * Fix some TCOs not saving properly (LMMS#5537) * Travis: stop auto-uploading binary releases * Update CONTRIBUTORS * Add a CMake option for deploying Qt translations * Update PROJECT_YEAR * Bump version to 1.2.2 * Update LcdSpinBox.cpp (LMMS#5555) * Make Pause hotkey Shift+Space (LMMS#5554) Co-authored-by: Dominic Clark <mrdomclark@gmail.com> Co-authored-by: Hyunjin Song <tteu.ingog@gmail.com> Co-authored-by: Lost Robot <34612565+DouglasDGI@users.noreply.github.com> Enable fullscreen with hotkey & hotkey to toggle maximise in internal window Update LcdSpinBox.cpp (LMMS#5555) Travis: stop auto-uploading binary releases Update CONTRIBUTORS Add a CMake option for deploying Qt translations Update PROJECT_YEAR Bump version to 1.2.2 Make Pause hotkey Shift+Space (LMMS#5554) Refactor deleteUnusedChannels in FxMixerView (LMMS#5564) * Refactor deleteUnusedChannels in FxMixerView * Comments + style fix Co-authored-by: Veratil <veratil@gmail.com>, formatting, suggestions on which lines to comment. Co-authored-by: Kevin Zander <veratil@gmail.com> * Update weird deleteChannel loop * Use vector instead of array Co-authored-by: Dominic Clark <mrdomclark@gmail.com> Co-authored-by: Kevin Zander <veratil@gmail.com> Co-authored-by: Dominic Clark <mrdomclark@gmail.com> Better minimum length when resizing notes (LMMS#5512) * Limit note length to quantization value Draging a note to it's minimum value of 1 will add this new length to the note if you later choose to stretch it which will not be clearly visible in the Piano Roll unless you zoom in a bit. Limit the note length to the quantization value and use <Alt> key to override and set a smaller value. * Update src/gui/editors/PianoRoll.cpp Co-authored-by: Spekular <Spekular@users.noreply.github.com> * Remember min note length if shorter than quantization() * Find note length modulo quantization, pick smallest from selected notes * Comment on and improve m_minResizeLen calculation Co-authored-by: Oskar Wallgren <oskar.wallgren13@gmail.com> Make "Change Color" a track-wide setting for all tracks Rebase #2 (#3) * Refactor deleteUnusedChannels in FxMixerView (LMMS#5564) * Refactor deleteUnusedChannels in FxMixerView * Comments + style fix Co-authored-by: Veratil <veratil@gmail.com>, formatting, suggestions on which lines to comment. Co-authored-by: Kevin Zander <veratil@gmail.com> * Update weird deleteChannel loop * Use vector instead of array Co-authored-by: Dominic Clark <mrdomclark@gmail.com> Co-authored-by: Kevin Zander <veratil@gmail.com> Co-authored-by: Dominic Clark <mrdomclark@gmail.com> * Better minimum length when resizing notes (LMMS#5512) * Limit note length to quantization value Draging a note to it's minimum value of 1 will add this new length to the note if you later choose to stretch it which will not be clearly visible in the Piano Roll unless you zoom in a bit. Limit the note length to the quantization value and use <Alt> key to override and set a smaller value. * Update src/gui/editors/PianoRoll.cpp Co-authored-by: Spekular <Spekular@users.noreply.github.com> * Remember min note length if shorter than quantization() * Find note length modulo quantization, pick smallest from selected notes * Comment on and improve m_minResizeLen calculation Co-authored-by: Oskar Wallgren <oskar.wallgren13@gmail.com> Co-authored-by: Spekular <Spekular@users.noreply.github.com> Co-authored-by: Kevin Zander <veratil@gmail.com> Co-authored-by: Dominic Clark <mrdomclark@gmail.com> Co-authored-by: Oskar Wallgren <oskar.wallgren13@gmail.com> Enable track-wide color coding Enable track-wide color changing
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Blank