hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity
4,920 Commits 9 Branches 62 Tags
ecb4c636c899b8d522905f115aca0666c805c091
Commit Graph

1445 Commits

Author SHA1 Message Date
Alexandre
0a3ff51c7e Merge branch 'coding' of https://github.com/M374LX/lmms into coding 
Conflicts:
	src/core/Track.cpp
 2015-03-01 13:39:50 -03:00
Alexandre
3d46f8a290 Merge branch 'coding' 
Conflicts:
	include/Note.h
	include/ProjectVersion.h
	include/TimeLineWidget.h
	include/Track.h
	src/core/Plugin.cpp
	src/core/ProjectVersion.cpp
	src/core/Song.cpp
	src/core/Track.cpp
	src/gui/TimeLineWidget.cpp
 2015-03-01 12:55:58 -03:00
Jonas Trappenberg
76ffbd6528 Merge branch 'master' into coding 
Conflicts:
	include/Plugin.h
	src/core/Note.cpp
	src/core/Track.cpp
 2015-01-31 19:11:33 -08: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
0f43b0a472 Merge pull request #1710 from curlymorphic/i1595 
Proposed fix for #1595 Instrument track activity LED lights when muted.
 2015-01-29 13:54:53 -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
Amadeus Folego
dae0c05061 Change Shift+Resize selected notes on Piano Roll 
Selected notes: when resized would offset posterior, non-selected notes
to mantain some kind of melodic structure. This is referred to
as *sticky* behaviour.

It also assumes some kind of intention that may not be the case.
Also adds complexity to a simple feature.

This commit makes only the the selected notes be offset. It also adds a
new shortcut to the old behaviour <Shift-Ctrl-drag to the note tip>.

Fixes #1666
 2015-01-28 23:22:29 -02:00
Dave French
7c0ab622f1 Proposed fix for 1595 Instrument track activity LED lights when muted 2015-01-28 12:16:21 +00:00
Lukas W
7b5084c53b Merge pull request #1690 from curlymorphic/821 
Renamed parameters on selectRegionFromPixels
 2015-01-26 14:17:25 +01:00
Dave French
cebf8bfd59 Renamed parameters on selectRegionFromPixels 2015-01-25 20:37:00 +00:00
Lukas W
0e778d042b Merge pull request #1674 from curlymorphic/i446 
Proposed fix for 446, select notes in piano roll using timeline
 2015-01-24 11:19:58 +01:00
Dave French
e2a2d27bba 446 change parameter names 2015-01-24 06:30:23 +00:00
Dave French
dfbbcfd38b 1416 tidy up 2015-01-23 02:38:17 +00:00
Dave French
c201a41c05 Proposed fix 1416 Drag-and-drop of automatables to Automation Editor 2015-01-23 02:16:30 +00:00
Dave French
2be8eaa4db Proposed fix for 446, select notes in piano roll using timeline 2015-01-22 20:16:00 +00:00
Lukas W
df9d495571 Some #include cleanups 2015-01-22 16:28:41 +01:00
Lukas W
ebd531e69f Merge pull request #1652 from curlymorphic/821 
proposed fix 821 Range-select in Song Editor
 2015-01-22 13:16:40 +01:00
Lukas W
d41d816b57 Merge pull request #1661 from teeberg/style 
Work on codestyle and readability
 2015-01-21 14:19:45 +01:00
Lukas W
d6ff1a7086 Fix BB Editor project load 
Closes #1621
 2015-01-21 13:33:57 +01:00
Dave French
1cf9300f72 821 changed to use sockets/ slots 2015-01-21 11:55:30 +00:00
Jonas Trappenberg
52ec4722fb Add explanation to acronym variable 2015-01-20 20:37:58 -08:00
Jonas Trappenberg
deb3e45791 More code style fixes 2015-01-20 20:26:33 -08:00
Jonas Trappenberg
8c76af1806 Remove premature optimization in float comparison 2015-01-20 20:26:11 -08:00
Jonas Trappenberg
71bab17233 Work on codestyle and readability 2015-01-19 19:54:06 -08:00
Alexandre
2834bd17f4 Coding conventions update 2015-01-20 00:00:58 -02:00
Alexandre Almeida
2e7732a7f5 Update ProjectVersion.h 2015-01-19 23:20:54 -02:00
Alexandre Almeida
38799f80af Update Plugin.h 2015-01-19 23:19:18 -02:00
Alexandre Almeida
4d6d937cf2 Update Timeline.h 2015-01-19 23:18:30 -02:00
Alexandre Almeida
77ceda9385 Update Song.h 2015-01-19 23:16:41 -02:00
Alexandre Almeida
c398769020 Update coding conventions 2015-01-19 23:11:02 -02:00
Alexandre Almeida
d04076f44d Update coding conventions on Note.h 2015-01-19 23:08:19 -02:00
Daniel Winzen
a3e5a65957 Fix SongEditorWindow resize when a project loads 2015-01-19 15:32:16 +01:00
Dave French
b3d943920c proposed fix 821 Range-select in Song Editor 2015-01-18 19:16:43 +00:00
Tres Finocchiaro
57876fead2 Merge pull request #1611 from curlymorphic/i760 
Proposed fix 760  Improve search field
 2015-01-15 15:03:43 -05:00
Lukas W
ebf68d57a9 ProjectVersion: Some refactoring 2015-01-15 17:27:58 +01:00
Lukas W
a18f86bde7 ProjectVersion: Clean up a bit, add a test 2015-01-15 17:27:58 +01:00
Lukas W
a52e4724cf Some small SongEditor fixes 2015-01-15 17:27:57 +01:00
Jonas Trappenberg
7f38a51f9d Merge remote-tracking branch 'upstream/master' 2015-01-14 21:07:36 -08:00
Lukas W
030292cbad Merge pull request #1582 from tresf/master 
ProjectVersion: Expose major/minor/release/build info
 2015-01-14 20:26:43 +01:00
Jonas Trappenberg
d27d43ac42 Merge remote-tracking branch 'upstream/master' 2015-01-13 21:36:41 -08:00
Tres Finocchiaro
697fc4dd0f Fix typo in comments 2015-01-13 11:50:11 -05:00
Tres Finocchiaro
17f32f344f Better switching of comparators, char[] constructor 2015-01-13 11:38:17 -05:00
Tres Finocchiaro
260694077d Misc ProjectVersion improvments 2015-01-13 11:35:46 -05:00
Lukas W
f640769ff0 SongEditor and BBEditor: Accept drops in toolbar 2015-01-13 17:29:19 +01:00
Jonas Trappenberg
ddfc3b3ee3 Remove redundant switch breaks. 2015-01-12 20:33:03 -08:00
Tres Finocchiaro
6e899d3993 Merge pull request #1572 from badosu/assign-instrument-to-fx-channel 
Add "Assign to FX Channel" context button to track
 2015-01-12 22:02:31 -05:00
Amadeus Folego
2eb420cb92 Add "Assign to FX Channel" context button to track 2015-01-13 00:45:48 -02:00
Tres Finocchiaro
21f5bb0b93 Merge pull request #1525 from badosu/show-errors-on-cli 
[WIP] Refactor errors notification system
 2015-01-12 21:45:23 -05:00