Skip to content
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.

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

Master #8

Merged
merged 26 commits into from
Jun 21, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
3dcffbf
fix hanging mouse in piano roll (#4822) (#4960)
sharpblade4 May 6, 2019
b9503a8
Fix race conditions in NotePlayHandleManager (#4966)
PhysSong May 8, 2019
50796b2
Nescaline and Freeboy - Better default sound (#4968)
zonkmachine May 9, 2019
934ea6d
Fix controller loading error on loading projects
PhysSong May 9, 2019
4b4b470
Extend ProjectJournal docs, thx to @DomClark
JohannesLorenz May 13, 2019
ec64de0
Fixes #4781: Don't disconnect LADSPA automation on export
T0NIT0RMX May 14, 2019
9c6e227
SampleTrack: call requestChangesInModel before unref SampleBuffer (#4…
Reflexe May 27, 2019
fad89d6
i18n: update translations from Transifex
liushuyu May 28, 2019
37f0c3f
SampleBuffer -> Use processingSampleRate.
Reflexe May 22, 2018
6d27f90
Bugfix - SampleTrack -> Load & Save: Fix recorded sample track not being
Reflexe Dec 16, 2017
665e503
Bugfix - SampleTrack -> Play: Fix sample track not being played in the
Reflexe Dec 16, 2017
359de20
i18n: update template strings
liushuyu Jun 6, 2019
c37228c
Travis: fix macOS build due to the old default version of Node.js
PhysSong Jun 6, 2019
47d6388
MP3 export: initialize ID3 tag with id3tag_init
PhysSong Jun 6, 2019
d194c70
updated splash (#5002)
RebeccaDeField Jun 7, 2019
6e5650c
Fixes #4996: Fix metadata when exporting multiple tracks (#5005)
JohannesLorenz Jun 7, 2019
457f2c6
Fix German translation
JohannesLorenz Jun 6, 2019
ca06b88
DMG rebranding (#5013)
tresf Jun 8, 2019
bfa8a4b
fix color profile error (#5019)
RebeccaDeField Jun 8, 2019
0fbaca4
Bump version to 1.2.0
PhysSong Jun 9, 2019
723a451
Add a save option to discard MIDI connections (#5021)
Reflexe Jun 9, 2019
df79f8c
Enable dark title bar on macOS
tresf Jun 12, 2019
4cb243b
Travis: drop unneeded prefix setting for npm
PhysSong Jun 12, 2019
12ea80d
Merge branch 'stable-1.2'
PhysSong Jun 12, 2019
f141ae6
Fix macOS builds
PhysSong Jun 12, 2019
5431cc7
Replace tLimit() with qBound() and remove templates.h (#5040)
husamalhomsi Jun 15, 2019
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
3 changes: 3 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@ matrix:
depth: false
- os: osx
osx_image: xcode8.3
before_install:
# appdmg doesn't work with old Node.js
- if [ "$TRAVIS_OS_NAME" = osx ]; then nvm install 10; fi
install: ${TRAVIS_BUILD_DIR}/.travis/install.sh
script: ${TRAVIS_BUILD_DIR}/.travis/script.sh
after_script: ${TRAVIS_BUILD_DIR}/.travis/after_script.sh
Expand Down
2 changes: 1 addition & 1 deletion .travis/osx..install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ brew install $PACKAGES
# fftw tries to install gcc which conflicts with travis
brew install fftw --ignore-dependencies

sudo npm install -g appdmg
npm install -g appdmg
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ SET(PROJECT_COPYRIGHT "2008-${PROJECT_YEAR} ${PROJECT_AUTHOR}")
SET(VERSION_MAJOR "1")
SET(VERSION_MINOR "2")
SET(VERSION_RELEASE "0")
SET(VERSION_STAGE "rc8")
SET(VERSION_STAGE "")
SET(VERSION_BUILD "0")
SET(VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_RELEASE}")
IF(VERSION_STAGE)
Expand Down
Binary file modified cmake/apple/dmg_branding.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added cmake/apple/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions cmake/apple/lmms.plist.in
Original file line number Diff line number Diff line change
Expand Up @@ -147,5 +147,7 @@
<string>NSApplication</string>
<key>NSHighResolutionCapable</key>
<string>True</string>
<key>NSRequiresAquaSystemAppearance</key>
<string>False</string>
</dict>
</plist>
6 changes: 3 additions & 3 deletions cmake/apple/package_apple.json.in
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"title": "@MACOSX_BUNDLE_BUNDLE_NAME@ @MACOSX_BUNDLE_LONG_VERSION_STRING@",
"background": "@CMAKE_SOURCE_DIR@/cmake/apple/dmg_branding.png",
"icon-size": 72,
"icon-size": 128,
"contents": [
{ "x": 460, "y": 260, "type": "link", "path": "/Applications" },
{ "x": 220, "y": 260, "type": "file", "path": "@CMAKE_BINARY_DIR@/@[email protected]" }
{ "x": 139, "y": 200, "type": "file", "path": "@CMAKE_BINARY_DIR@/@[email protected]" },
{ "x": 568, "y": 200, "type": "link", "path": "/Applications" }
]
}
Loading