mirror/lmms
1
0
Fork 0
mirror of https://github.com/LMMS/lmms.git synced 2026-02-02 10:44:21 -05:00
Code Issues Packages Projects Releases Wiki Activity
5,279 Commits 10 Branches 61 Tags
ffba37c7f2a895e8b80098d5612cee6f461bfa54
Commit Graph

488 Commits

Author SHA1 Message Date
Colin Wallace
de7ad76de6 Merge pull request #2103 from Wallacoloo/git-2087b 
Fix for #2087: Issues with saving projects in X11 when one subwindow is maximized
 2015-06-29 18:37:56 -07:00
Colin Wallace
dad4e8ef10 Merge pull request #2105 from Wallacoloo/doc_typos 
Correct filenames within documentation strings
 2015-06-20 15:28:55 -07:00
Colin Wallace
81164e91a9 Correct filenames within documentation strings 2015-06-15 23:52:13 +00:00
Lukas W
61a9e9de02 Merge pull request #2104 from Wallacoloo/init_m_fb 
Properly initialize InstrumentTrack::m_fb
 2015-06-15 10:30:52 +02:00
Lukas W
44f8b24fb3 Merge branch 'stable-1.1' 
# Conflicts:
#	include/PianoRoll.h
#	src/gui/editors/PianoRoll.cpp
 2015-06-15 10:11:53 +02:00
Colin Wallace
eaf6ad35d8 Connect slots *after* initializing members 2015-06-15 06:48:04 +00:00
Colin Wallace
2616269b68 initialize m_fb to NULL 2015-06-15 06:33:41 +00:00
Colin Wallace
908591ba7d Have MainWindow and others make use of the new SubWindow class 2015-06-15 03:32:25 +00:00
Lukas W
422fbbc8d3 Merge branch 'master' into cmake_dist 
# Conflicts:
#	include/ConfigManager.h
#	include/Engine.h
#	plugins/CMakeLists.txt
#	plugins/vst_base/CMakeLists.txt
#	plugins/vst_base/Win64/CMakeLists.txt
#	src/core/Engine.cpp
 2015-05-30 22:59:06 +02:00
Steffen Baranowsky
0e5c6aeaf8 Sets the Focus to the InstrumentTrackWindow if a preset or a sample droped to it. 2015-05-24 02:30:58 +02:00
Colin Wallace
26fc16b78b Implementation of next & previous instrument buttons in InstrumentTrackWindow 2015-05-02 02:09:57 +00:00
Lukas W
e0f077ba02 Merge branch 'master' into cmake_dist 
# Conflicts:
#	include/Plugin.h
#	src/core/Plugin.cpp
 2015-03-21 11:53:00 +01:00
Dave French
ca414dab10 Added option to duplicate first bar, in BBEditor 
Added a new button to the action bar, using step_btn_duplicate.png

The new button, aswell as adding a bar to the patten, then
copies the first bar to the last.

fixes #457

BBEditor Duplicate Pattern. updated image, changed function name

Have updated the new image step_button_duplicate.png

Renamed the function from duplicateFirstBarAtEnd to duplicateSteps.

BBEditor renamed function duplicateSteps

renamed duplicateSteps() to cloneSteps() as requested

BBEditor rechange duplicateSteps to cloneSteps

BB Editor changed actionBtn text from duplicate to clone
 2015-03-11 21:50:44 +00:00
Dave French
6ad5d88c08 Reinstate Double Click opening the piano roll from song editor 
This fixes a bug introduced when removing double click from
BB patterns. It Now checks if we use fixedTCO's (bb tomb stones),
only disable double clikc if so, leaving it working correcly in the
song editor
 2015-03-01 14:37:07 +00:00
Dave French
448f5be350 Removed Double click to open piano roll, in the BBeditor, this is to stop notes being added in error 2015-02-24 22:08:46 +00:00
Lukas W
35e1c4ed89 Refactor: Move plugin file support handling to PluginFactory 2015-02-05 17:22:23 +01:00
Amadeus Folego
c99e47f581 Add "Assign to new FX Channel" action to FXSpinBox 
Fix #604 #921
 2015-01-30 13:25:10 -02:00
Amadeus Folego
06cb85b771 Move FX assignment/creation logic to InsTrackView 2015-01-30 13:25:10 -02:00
Tres Finocchiaro
e2d98668ec Merge pull request #1699 from curlymorphic/bbundo 
Song Editor and bbEditor undo.
 2015-01-29 15:39:43 -05:00
Dave French
5ce1bd874d renamed muteHasChanged to muteChanged in InstrumentTrackView 2015-01-29 10:13:25 +00:00
Dave French
968d0215df Moved Setting of activity indicator color from InstrumentTrack to InstrumentTrackView 2015-01-29 09:49:20 +00:00
Dave French
c02f043b3f Changed color of InstrumentTrack activity indicators mute color to use the color defined in style.css as highlight 2015-01-29 00:27:30 +00:00
Dave French
fa6dd6da8b Change color of muted activity indicator from red to grey 2015-01-28 22:12:59 +00:00
Dave French
9fee116fa7 1595 removed accidental blank line 2015-01-28 12:21:57 +00:00
Dave French
7c0ab622f1 Proposed fix for 1595 Instrument track activity LED lights when muted 2015-01-28 12:16:21 +00:00
Dave French
57460c91c3 bb patern 2015-01-27 00:28:40 +00:00
Amadeus Folego
8267ac6316 Fix beat pattern actions on melodies 2015-01-22 17:18:42 -02:00
Dave French
746ea39afb Proposed fix 818 Merge file name and preset name. Remove double naming 2015-01-18 21:39:09 +00:00
Amadeus Folego
f0b2d8b0af Fix export crashes adding gui checks 2015-01-13 01:51:27 -02:00
Lee Avital
7da4efda0f Implement 1429 -- move to next and previous pattern 2015-01-12 20:28:13 -05:00
Lukas W
c7ecd9cbba Merge pull request #1596 from LMMS/cmake 
CMake use explicit source file specifying
 2015-01-11 23:58:15 +01:00
Tres Finocchiaro
d0c8e7b307 Merge pull request #1593 from curlymorphic/i1345 
Proposed fix for 1345 Exclude tracks from master pitch
 2015-01-11 11:00:06 -05:00
Lukas W
ee3a99853b CMake use explicit source file specifying 2015-01-11 16:33:57 +01:00
Lukas W
56055b36b0 Merge branch 'master' into ed_refac 
Conflicts:
	src/gui/editors/PianoRoll.cpp
 2015-01-11 13:25:55 +01:00
Jonas Trappenberg
87e597510c Minor refactorings and codestyle cleanup. 2015-01-11 00:05:25 -08:00
Dave French
83baea6605 1345 moved LedCheckBox to MISC tab 2015-01-10 19:05:40 +00:00
Dave French
af22d39612 Proposed fix for 1345 Exclude Tracks from master pitch 2015-01-10 17:11:17 +00:00
Tres Finocchiaro
86c2673398 Merge pull request #1563 from DanWin/resize-cursor 
Don't display resize cursor for non-resizable TCOs
 2015-01-10 09:32:09 -05:00
Amadeus Folego
1dbc44a7f0 Refactor redundant pattern color assignment 
Instead of creating a new QColor for each condition just use the
`setRgb` method or fix the conditions order.
 2015-01-08 14:37:10 -02:00
Lukas W
7f2f9f2685 Merge branch 'master' into ed_refac 2015-01-08 10:49:09 +01:00
Amadeus Folego
421c071ab0 Fix muted track not highlighted on selection 
Fix #1239
 2015-01-07 15:55:58 -02:00
Lukas W
748cccd266 Merge branch 'gui_application' into ed_refac 
Conflicts:
	src/core/Song.cpp
	src/gui/MainWindow.cpp
 2015-01-07 00:03:32 +01:00
Lukas W
23e0e0fb8e Merge branch 'master' into ed_refac 
Conflicts:
	include/AutomationEditor.h
	include/SongEditor.h
	plugins/delay/delaycontrols.cpp
	plugins/delay/delaycontrolsdialog.cpp
	src/gui/editors/AutomationEditor.cpp
	src/gui/editors/BBEditor.cpp
	src/gui/editors/PianoRoll.cpp
 2015-01-06 23:05:13 +01:00
Daniel Winzen
01fac0d342 Add default behaviour to switch 2015-01-06 18:50:51 +01:00
Daniel Winzen
7440794597 Don't display resize cursor for non-resizable TCOs 2015-01-06 18:18:16 +01:00
Vesa
0cbb506f50 Fix preview crash caused by earlier commit 2015-01-04 18:47:05 +02:00
Vesa V
469cb98be0 Merge pull request #1506 from curlymorphic/i1255 
Proposed fix for 1255 Segment/clip not showing whole last note in Song E...
 2015-01-04 17:17:25 +02:00
Vesa V
146577d34b Merge pull request #1516 from grejppi/master-mute 
attempt to fix #1512
 2015-01-04 17:15:17 +02:00
Dave French
1e25b91410 1527 removed socket slot for indicator activation 2014-12-30 14:07:28 +00:00
Dave French
6d4d958ec6 Proposed fix 1527 Not all Played Notes shows the indicator on the InstrumentTrackView 2014-12-29 22:48:54 +00:00