Tobias Doerffel
|
606879421b
|
Merge remote-tracking branch 'origin/stable-1.1'
Conflicts:
README.md
|
2014-09-28 18:12:04 +02:00 |
|
Tobias Doerffel
|
613bcc981f
|
README.md: stripped old full program name
|
2014-09-28 18:09:47 +02:00 |
|
Tobias Doerffel
|
75a979b9a0
|
Merge pull request #1174 from DaAwesomeP/master
Update Readme
|
2014-09-28 18:08:50 +02:00 |
|
Tobias Doerffel
|
534c9c1668
|
Merge pull request #1174 from DaAwesomeP/master
Update Readme
|
2014-09-28 18:07:53 +02:00 |
|
Tobias Doerffel
|
d39d1b3840
|
ZynAddSubFX: added explicit check for FLTK's fluid binary
Closes #954.
|
2014-09-28 18:05:31 +02:00 |
|
P THE AWESOME
|
f505c31af4
|
Fix SF Wiki name in Readme
Changed to "Artist & User Wiki."
|
2014-09-28 10:56:21 -05:00 |
|
Vesa V
|
432d98d83d
|
Merge pull request #1179 from Spekular/stable-1.1
Background Art Fix
|
2014-09-28 12:31:53 +03:00 |
|
Spekular
|
ee359207f4
|
Revert "Update .gitignore"
This reverts commit 18bd03118f.
|
2014-09-28 10:18:35 +02:00 |
|
Spekular
|
6e2d803e09
|
Revert "Update .gitignore"
This reverts commit e8c6062f9a.
|
2014-09-28 10:18:26 +02:00 |
|
Spekular
|
e8c6062f9a
|
Update .gitignore
|
2014-09-28 10:07:10 +02:00 |
|
Spekular
|
18bd03118f
|
Update .gitignore
|
2014-09-28 10:06:18 +02:00 |
|
Spekular
|
6b54a4bcc1
|
Background Art Fix
Fixes Background art and provides .svg source
|
2014-09-28 10:04:02 +02:00 |
|
Vesa V
|
4d7c8c2f46
|
Merge pull request #1155 from falkTX/stable-1.1
Initial version of Carla plugin for LMMS
|
2014-09-28 10:49:23 +03:00 |
|
falkTX
|
9f6c9d96ef
|
Carla: Misc fixing
|
2014-09-27 00:31:28 +01:00 |
|
falkTX
|
5dddbe7c30
|
Pass timeInfo to Carla plugin
|
2014-09-26 11:58:42 +01:00 |
|
falkTX
|
8aa29bb4ba
|
Add TODO items for carla
|
2014-09-26 10:38:05 +01:00 |
|
falkTX
|
b0fab3d3c2
|
Carla: Implement UI Save/Open for plugins; Misc fixes
|
2014-09-26 10:31:08 +01:00 |
|
P THE AWESOME
|
1ace719ab7
|
Update Readme
|
2014-09-25 20:39:05 -05:00 |
|
Vesa V
|
2bd722f7c1
|
Merge pull request #1169 from diizy/master
Oops..
|
2014-09-21 22:29:22 +03:00 |
|
Vesa
|
412c477ddc
|
Oops..
|
2014-09-21 22:28:29 +03:00 |
|
Vesa V
|
06926bfeee
|
Merge pull request #1168 from diizy/master
Fix LFO phase
|
2014-09-21 22:21:52 +03:00 |
|
Vesa
|
da6c2ed04b
|
Fix LFO phase
|
2014-09-21 22:20:34 +03:00 |
|
falkTX
|
b88225ffc8
|
Carla: Fix link (rpath) and finding binary dir (needs latest carla)
|
2014-09-16 17:22:23 +01:00 |
|
Vesa V
|
3980239d26
|
Merge pull request #1154 from Sti2nd/stable-1.1
Corrected name error in Cool Songs and added Popsip-Electric Dancer
|
2014-09-14 22:34:12 +03:00 |
|
Stian Jørgensrud
|
af1b351dd2
|
Added Popsip-Electric Dancer to CoolSongs
|
2014-09-14 21:09:45 +02:00 |
|
Vesa
|
463f926d4e
|
Remove the mocfile inclusion in FileBrowser.cpp since it seems to break compiling for some reason
|
2014-09-12 19:31:19 +03:00 |
|
Vesa V
|
1c500376bb
|
Merge pull request #1158 from diizy/master
Remove the mocfile inclusion in FileBrowser.cpp since it seems to break ...
|
2014-09-12 19:30:59 +03:00 |
|
falkTX
|
849d08c6ef
|
Initial version of Carla plugin for LMMS
|
2014-09-11 16:54:31 +01:00 |
|
Stian Jørgensrud
|
09656a46e7
|
Corrected name error in Cool Songs
From Skeissi to Skiessi
|
2014-09-11 11:54:58 +02:00 |
|
Vesa
|
498d939e76
|
Merge branch 'stable-1.1'
|
2014-09-10 00:43:32 +03:00 |
|
Vesa V
|
90259a1512
|
Merge pull request #1149 from diizy/stable-1.1
Fix channel send connections
|
2014-09-10 00:41:15 +03:00 |
|
Vesa
|
44993319eb
|
Fix channel send connections
Fix #1147
Backwards compat should be maintained.
|
2014-09-10 00:40:29 +03:00 |
|
Vesa
|
bf6659fbb1
|
Merge branch 'stable-1.1'
Conflicts:
src/gui/FileBrowser.cpp
|
2014-09-09 23:55:39 +03:00 |
|
Tobias Doerffel
|
5bbd79de0f
|
Merge pull request #1145 from krafczyk/fix_for_doubleclick_knob_bug
Fix for doubleclick knob bug
|
2014-09-09 20:11:33 +02:00 |
|
Matthew Krafczyk
|
e20e863a99
|
Change isJournallingStackEmpty to isJournallingStateStackEmpty
|
2014-09-09 20:08:14 +02:00 |
|
Matthew Krafczyk
|
0cdfd7c354
|
Fix syntax a bit.
|
2014-09-09 17:15:54 +02:00 |
|
Matthew Krafczyk
|
32eae51128
|
Made isEmpty function name more specific. Moved doubleclick fix to restoreJournallingState.
|
2014-09-09 17:07:40 +02:00 |
|
Matthew Krafczyk
|
c628387cd2
|
Make syntax for fix more consistent with existing code.
|
2014-09-09 01:39:08 +02:00 |
|
Matthew Krafczyk
|
00086c9f20
|
Merge branch 'stable-1.1' into fix_for_doubleclick_knob_bug
|
2014-09-09 01:19:58 +02:00 |
|
Matthew Krafczyk
|
84895a4f79
|
Fix for 'Crash double-clicking any knob in debug build (git master) (#948)'
Conflicts:
src/gui/widgets/knob.cpp
|
2014-09-09 01:14:19 +02:00 |
|
Tres Finocchiaro
|
9a80205407
|
Merge pull request #1143 from tresf/stable-1.1
(Apple only) WANT_SF2 OFF, Disable Zyn GUI
|
2014-09-08 12:54:06 -04:00 |
|
Ubuntu
|
74e53f8354
|
Set "WANT_SF2" to "OFF" for Apple
|
2014-09-08 12:35:57 -04:00 |
|
Tres Finocchiaro
|
e17e84266d
|
Fix bad #ifdef, make ANSI compliant
`#elif LMMS_BUILD_APPLE` is not correct, it should be `#elif defined(LMMS_BUILD_APPLE)`
|
2014-09-08 11:24:39 -04:00 |
|
Tres Finocchiaro
|
adc134bbca
|
Merge pull request #1142 from tresf/stable-1.1
(Apple only) Re-enable OPL2, Disable SF2
|
2014-09-08 11:14:38 -04:00 |
|
Ubuntu
|
40f640951c
|
Disable "Show GUI" button on Apple to prevent crash
|
2014-09-08 11:13:50 -04:00 |
|
Ubuntu
|
d95fea2d3f
|
Re-enable OPL2 on Apple, Disable SF2
|
2014-09-08 10:53:59 -04:00 |
|
Tres Finocchiaro
|
7fdb52c172
|
Merge pull request #1141 from tresf/stable-1.1
Fix AFP crash, bump version
Tested by @DeRobyJ, merging.
|
2014-09-08 10:33:39 -04:00 |
|
Ubuntu
|
c01799e998
|
Fix AFP crash, bump version
|
2014-09-08 09:26:50 -04:00 |
|
Vesa V
|
02dd2cf63f
|
Merge pull request #1139 from Umcaruje/stable-1.1-newpresets
New presets for Monstro, Bitinvader, Watsyn and Kicker.
|
2014-09-08 06:01:48 +03:00 |
|
Vesa V
|
13928eb4d9
|
Merge pull request #1138 from tresf/stable-1.1
Fix win32 compilation
|
2014-09-08 06:01:20 +03:00 |
|