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

4263 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vesa
eea784ce71 Merge branch 'master' of github.com:LMMS/lmms 2014-11-25 21:24:21 +02:00
Vesa
33665a2848 Merge branch 'stable-1.1' 
Conflicts:
	include/Effect.h
	include/Plugin.h
 2014-11-25 21:23:57 +02:00
Vesa V
435c64cc70 Merge pull request #1285 from grindhold/issue_55 
Issue 55
 2014-11-25 21:20:21 +02:00
Lukas W
14eb54d53e Piano Roll: Don't switch to select mode when pressing Ctrl+A 
Or don't act like we did. Fixes #431
 2014-11-25 20:18:35 +01:00
Vesa V
55c59a77bd Merge pull request #1327 from DanWin/stable-1.1 
Fix most warnings and errors when generating translation files
 2014-11-25 21:04:04 +02:00
Lukas W
ed2cd2dda5 Instrument view: Restrict mouse wheel tab switching 
Only switch the view's tab when the mouse pointer is hovering over the tabs. Closes #712.
 2014-11-25 18:42:41 +01:00
Lukas W
d318cbb1e7 Move track.h -> Track.h, track.cpp -> Track.cpp 2014-11-25 17:10:49 +01:00
Lukas W
9dfb1385cd Rename track class to Track 2014-11-25 17:03:39 +01:00
Lukas W
5d258cedf2 When removing a track, remove its solo state 
Fixes #1103
 2014-11-25 16:47:11 +01:00
Vesa V
79f71a932d Merge pull request #1349 from LMMS/stable-1.1 
Stable 1.1
 2014-11-25 13:17:46 +02:00
Lukas W
e935cb046e Fix header guards 
Closes #177
 2014-11-25 11:25:30 +01:00
Vesa V
334a567620 Merge pull request #1234 from floft/master 
GIG Player Plugin
 2014-11-25 07:03:12 +02:00
Vesa V
aed82571e3 Merge pull request #1342 from Umcaruje/stable-1.1 
Fix old sourceforge links, update Readme
 2014-11-25 07:01:11 +02:00
Lukas W
f231465e05 Rename plugin_browser to PluginBrowser 2014-11-25 01:10:59 +01:00
Lukas W
3a206071b1 Fix merge conflicts 2014-11-25 01:07:39 +01:00
Lukas W
02cbc89f0f Merge branch 'stable-1.1' of git@github.com:LMMS/lmms.git 
Conflicts:
	src/gui/MainWindow.cpp
	src/gui/plugin_browser.cpp
 2014-11-25 01:01:47 +01:00
Lukas W
e47c1242b8 Add scrollbar to instrument plugin browser 
Fixes #959
 2014-11-25 00:36:23 +01:00
Garrett
205056621c Fixed release samples never being deleted 
I removed code in a previous commit that deleted ended samples since
that sometimes caused issues when the samples had loop points. However,
removing the code caused issues with the release samples. Thus, now it
removes ended samples only if they are release samples. Otherwise, the
keyup event and ADSR handle ending the note.
 2014-11-23 14:24:51 -08:00
Tres Finocchiaro
27bff6f5d3 Merge pull request #1344 from midi-pascal/stable-1.1 
Stable 1.1
 2014-11-23 16:16:13 -05:00
pascal
e6ca46fabb Merge branch 'stable-1.1' of https://github.com/midi-pascal/lmms into stable-1.1 2014-11-23 15:44:38 -05:00
pascal
d1e50b9f32 Bug #1335 
Hide Size and Maximize options from the intrument dialog
system menu since its size is fixed.
 2014-11-23 15:24:42 -05:00
Daniel Winzen
3602aa316f Move Monstro macros back to headers 2014-11-23 19:58:00 +01:00
Umcaruje
180b293ce3 Fix old sourceforge links, update Readme 2014-11-23 19:55:34 +01:00
Daniel Winzen
ad844e72a3 Also scan headers for translatable strings 2014-11-23 19:54:51 +01:00
Garrett
366e799791 More What's This messages 2014-11-23 10:31:18 -08:00
Vesa V
09f2f60af3 Merge pull request #1304 from curlymorphic/stable-1.1 
Tempo synced Delay Plugin
 2014-11-23 15:16:26 +02:00
Vesa V
79b1c4df37 Merge pull request #1326 from DeRobyJ/stable-1.1 
Italian Loca - Grammar Fix 01
 2014-11-23 13:58:42 +02:00
dave
7e780fc057 Improved ui 2014-11-23 11:20:03 +00:00
Daniel Winzen
92930b2240 Update German translation 2014-11-21 21:40:26 +01:00
Daniel Winzen
df3a03f64c Add more missing Q_OBJECT macros 2014-11-21 21:08:48 +01:00
grindhold
61a380a2d4 renamed method logError to collectErrorForUI 2014-11-21 19:02:27 +01:00
Lukas W
22ec15f2d7 PianoRoll arrow key behaviour tweaks 
* Ctrl + Left/Right moves selected notes by one bar
  (Old behaviour was to move the playnote)
  Closes #811
* Shift + Up/Down moves selected nodes by one semitone
  (Old behaviour was to ignore the Shift key and move the viewport)
  Closes #810
 2014-11-21 17:04:46 +01:00
Lukas W
941ed33248 Travis: Install nsis 2014-11-21 16:58:04 +01:00
Daniel Winzen
a9a851d2f0 About dialog: Move involved tab into .ui file 2014-11-21 16:29:32 +01:00
Lukas W
9e245f7ca0 PianoRoll arrow key behaviour tweaks 
* Ctrl + Left/Right moves selected notes by one bar
  (Old behaviour was to move the playnote)
  Closes #811
* Shift + Up/Down moves selected nodes by one semitone
  (Old behaviour was to ignore the Shift key and move the viewport)
  Closes #810
 2014-11-21 14:42:11 +01:00
Vesa
af34230346 Merge branch 'stable-1.1' 
Conflicts:
	data/locale/zh.ts
 2014-11-21 14:06:12 +02:00
Vesa V
ac35d2e1dc Merge pull request #1334 from diizy/stable-1.1 
Fix logscale saving
 2014-11-21 14:03:04 +02:00
Vesa
1cd3c9be2c Fix logscale saving 
User-set logscale property wasn't getting saved properly in projects, fixed now
 2014-11-21 13:55:32 +02:00
Lukas W
1b2966dc37 CMakeLists.txt indentation 2014-11-21 11:48:40 +01:00
Lukas W
b3e30392f7 Remove some legacy code for Qt<4.4 2014-11-21 11:48:40 +01:00
Daniel Winzen
5c0829399f Fix moc_file inclusion in cmake files 
This should fix the Windows builds
 2014-11-21 07:16:45 +01:00
Daniel Winzen
3ca76d40ed Add missing Q_OBJECT macros in header files 
Fixes 20 warnings similar to the following ones when generating a translation file with e.g. "make de.ts":
/home/daniel/Lmms/src/tracks/AutomationTrack.cpp:40: Class 'AutomationTrack' lacks Q_OBJECT macro
/home/daniel/Lmms/src/core/FxMixer.cpp:41: Class 'FxRoute' lacks Q_OBJECT macro
/home/daniel/Lmms/src/core/FxMixer.cpp:554: Class 'FxMixer' lacks Q_OBJECT macro
/home/daniel/Lmms/src/gui/widgets/MeterDialog.cpp:52: Class 'MeterDialog' lacks Q_OBJECT macro
...
 2014-11-21 06:46:47 +01:00
grindhold
f954b07958 rudimentary errormessage for missing sf2-plugins 2014-11-20 22:27:19 +01:00
Vesa
00cb2b1b67 Sync 2014-11-20 18:58:56 +02:00
Lukas W
733e206b44 Travis: Install nsis 2014-11-20 09:17:52 +01:00
Tres Finocchiaro
06d5ee2ec3 Bump version 
Skip RC 8 and go to RC 9 to avoid confusion, since RC 8 used in tresf/releases to test a bug
 2014-11-20 00:03:01 -05:00
grindhold
69bf4b4a24 implemented proper behaviour for VST plugins 2014-11-20 01:47:13 +01:00
Tres Finocchiaro
e9db4f7152 Merge pull request #1330 from grindhold/issue_1328 
Merged anyway. :)  Thanks again @grindhold.
 2014-11-19 14:31:29 -05:00
Tres Finocchiaro
67c4f4fa14 Merge pull request #1331 from grindhold/stable-1.1 
adjust height of setup_dialog for  stable-1.1

Closes #1328
 2014-11-19 11:29:45 -05:00
grindhold
b09067e0b8 adjusted height of setup dialog 2014-11-19 17:10:44 +01:00