Skip to content

Merge stable-1.2 into master #3607

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
liushuyu wants to merge 70 commits into from
Closed

Merge stable-1.2 into master #3607

Changes from 1 commit
Commits
Show all changes
70 commits
Select commit Hold shift + click to select a range
32f07ac
Added Buzzer Beater to demos (#3482)
ivhacks Apr 8, 2017
09c9ccb
Simpler SF2 Player file dialog. Copied from GIG Player. Opens correct…
karmux Apr 15, 2017
2df5682
Fixed #3182. Always using master channel for preset previews. (#3503)
karmux Apr 16, 2017
2f51062
Dual Filter Plugin Redesign (#3484)
RebeccaDeField Apr 27, 2017
a7154df
EQ plugin now responds to wet / dry control
curlymorphic May 1, 2017
50ccfba
Correct the Delay syncronisation
curlymorphic May 1, 2017
082dbed
Revert "'Off beat' beat notes to MelodyPattern"
zonkmachine Apr 24, 2017
0190256
Merge pull request #3520 from curlymorphic/eqWetDry
tresf May 2, 2017
7749618
Merge pull request #3522 from curlymorphic/delaySync
tresf May 3, 2017
d2e50df
Disable HiDPI on Windows
tresf May 4, 2017
6a5255e
Merge pull request #3531 from tresf/hidpi
tresf May 6, 2017
7e3ee14
Make factory samples relative (#3510)
tresf May 6, 2017
1848ed2
LFO controller now has correct frequency with multiple connections.
curlymorphic May 7, 2017
75077f6
Fix automation processing in BB tracks (#3481)
lukas-w Apr 6, 2017
ff4ffd1
Merge pull request #3535 from curlymorphic/lfo
tresf May 7, 2017
4196a30
Implement 24 bit support for WAV export (#3021)
michaelgregorius Apr 28, 2017
d5fc38e
Simplification of code and structure in the area of the file export
michaelgregorius Apr 29, 2017
4ac6aa9
Only show relevant widgets on the export dialog
michaelgregorius Apr 29, 2017
8237889
Add the option to enable variable bit rates to the export dialog
michaelgregorius Apr 29, 2017
f06eac3
Add copyright info to the file OutputSettings.h
michaelgregorius Apr 30, 2017
4b3309a
Make the 24 bit export the default selection in the export dialog
michaelgregorius Apr 30, 2017
dfeb6be
Rename entry for bit depth from "24 Bit Float" to "24 Bit Integer"
michaelgregorius May 2, 2017
08201c2
Merge pull request #3552 from michaelgregorius/3021-24-Bit-Export-For…
michaelgregorius May 12, 2017
290556e
Remove Limited Session
zonkmachine Sep 10, 2016
17b37e0
Provide support for fallback config values (#3551)
tresf May 14, 2017
69d09f0
don't change sampleTco length if tempo changed (#3543)
BaraMGB May 14, 2017
f390fd1
ReverbSC: Method to change samplerate (#3401) (#3403)
PaulBatchelor May 15, 2017
b0ae31c
Update Discord invite to link to #welcome (#3556)
Spekular May 15, 2017
b432707
Remove glitching from the Flanger and Delay plugins (#3524)
curlymorphic May 17, 2017
300058d
Flanger LFO rate syncronised (#3521)
curlymorphic May 17, 2017
c0b910e
Replacement metronome samples (#3513)
WrillicR May 17, 2017
6970c88
fix alternate shading for changing time signature (#3559)
BaraMGB May 17, 2017
f8a508f
Fixes #3563 (#3567)
PhysSong May 21, 2017
38bca9a
fix time signature updates timelinewidget also on pos 0 (#3572)
BaraMGB May 23, 2017
3607c92
Bitcrush Plugin Redesign (#3575)
RebeccaDeField May 27, 2017
745042d
Fix CMP0050 compilation warnings
tresf May 28, 2017
f1a3368
Merge pull request #3583 from tresf/stable-1.2
tresf May 28, 2017
1eef218
fix export project for sampletracks with vst effects on it (#3571)
BaraMGB May 29, 2017
4ff091f
Fix loop condition in project rendering (#3105, #2030) (#3576)
PhysSong May 29, 2017
74790c0
Update Discord link to point to #rules (#3588)
Spekular May 29, 2017
9bdc011
Fix export - double dialog windows on writing over existing file (#3526)
zonkmachine May 30, 2017
53772c0
Allow WidgetTab to use artwork tabs (@StCyr) (#3569)
Umcaruje May 31, 2017
afd22c8
Bump version number for RC3
Umcaruje May 31, 2017
635b50b
VeSTige opens correct folder (#3550)
karmux May 31, 2017
7be6374
Add more brew packages (#3595)
tresf Jun 1, 2017
445bfe9
VST plugin compilation fix in ubuntu 64bit. (#3593)
tresf Jun 1, 2017
1f66f62
Proper Case Renames (#3573)
miketurn Jun 2, 2017
cee68c7
fixes position marker height on startup (#3587)
BaraMGB Jun 2, 2017
dd80268
Fix overzealous quoting (#3604)
tresf Jun 2, 2017
6bb19f4
update i18n strings
liushuyu May 9, 2017
075d980
Update i18n source strings
liushuyu Jun 3, 2017
e36b05e
Add myself (Michael Gregorius) to the list of authors
michaelgregorius Jun 5, 2017
d3359f5
Fix #3616 by preventing fold overs for clipped data
michaelgregorius Jun 6, 2017
5678981
Fixed LMMS crash when pressing Q in not existing piano roll. (#3609)
karmux Jun 7, 2017
1435717
fixes sample muting bug for sampletrack (#3591)
BaraMGB Jun 8, 2017
5a2d8f1
fixes rounding issue in automatablemodel (#3597)
BaraMGB Jun 9, 2017
a371ff0
Some fixes to recent files (#3621)
zonkmachine Jun 10, 2017
ad2c843
Fixed inverted zooming. (#3570)
karmux Jun 10, 2017
c53dd31
Silence warning message and fix obsolete vorbis tag message (#3634)
zonkmachine Jun 12, 2017
c2f26a7
Implement MP3 encoding support
michaelgregorius Jun 12, 2017
b2919d6
Disable HiDPI fix for Windows 7 and older
tresf Jun 12, 2017
fc6d844
saves the correct subwindow size when it is hidden (#3589)
BaraMGB Jun 13, 2017
842c719
Implement command line export for MP3 (#3641)
michaelgregorius Jun 18, 2017
21caf2b
Correct spellings in fft_helpers.cpp (#3645)
PhysSong Jun 19, 2017
13e65b7
Ensure midi port exists before removing
zonkmachine Jun 22, 2017
494714b
Update classic/style.css with TabWidget, TrackView, PianoView and Fad…
PhysSong Jul 3, 2017
c6c67b3
Fixes for project loading progress display (#3672)
PhysSong Jul 6, 2017
d65e1a3
MIDI - Don't apply base velocity to all controller values. (#3678)
zonkmachine Jul 6, 2017
020f165
Clean up after render in ProjectRenderer destructor
zonkmachine Jul 3, 2017
c565bf5
Merge remote-tracking branch 'upstream/stable-1.2' into merge
liushuyu Jul 14, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Rename entry for bit depth from "24 Bit Float" to "24 Bit Integer"
  • Loading branch information
@michaelgregorius
michaelgregorius committed May 12, 2017
commit dfeb6bea3a415ffb9757ff4b7018cd7714bf0ee6
2 changes: 1 addition & 1 deletion src/gui/dialogs/export_project.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@
</item>
<item>
<property name="text">
<string>24 Bit Float</string>
<string>24 Bit Integer</string>
</property>
</item>
<item>
Expand Down