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

4048 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vesa
16fb09fb94 Merge branch 'stable-1.1' 2014-11-10 20:33:02 +02:00
Lukas W
8e8879f735 Merge stable-1.1 
Conflicts:
	include/ConfigManager.h
	include/MidiTime.h
	include/string_pair_drag.h
	src/gui/string_pair_drag.cpp
	src/gui/widgets/rubberband.cpp
 2014-11-10 19:26:59 +01:00
Vesa
d685adf73a Do not create checkpoints for moving tracks 2014-11-10 00:57:50 +02:00
Vesa V
e2911884a6 Merge pull request #1280 from DeRobyJ/stable-1.1 
Italian 1.1 Loca Update
 2014-11-09 13:03:32 +02:00
DeRobyJ
b6046ad2c1 Italian 1.1 Loca Update 
I hope this time it will work xD
 2014-11-09 11:30:37 +01:00
Vesa V
2c7036edd6 Merge pull request #1258 from grindhold/brokenproject 
attempt to open broken project does not clear currently open project
 2014-11-08 12:21:31 +02:00
Vesa V
d10eecbf5f Merge pull request #1277 from LMMS/c++11 
Enable C++11
 2014-11-08 12:16:01 +02:00
Vesa V
102db9cd50 Merge pull request #1266 from tresf/stable-1.1 
Fix automation cursor position issue
 2014-11-08 12:07:47 +02:00
Lukas W
9d395ac0c1 Enable C++11 2014-11-08 10:26:10 +01:00
Tres Finocchiaro
e7721dfd78 Bump version v1.0.96 2014-11-07 08:30:41 -05:00
Lukas W
bf484300b6 Fix some memory leaks 2014-11-06 21:23:16 +01:00
Vesa V
8f7593f82e Merge pull request #1256 from grindhold/metronome 
first metronome click of a tact now has a higher pitch #1254
 2014-11-05 01:50:13 +02:00
Lukas W
8242ca9cac Merge branch 'Umcaruje-stable-1.1-namefix' into stable-1.1 2014-11-05 00:46:16 +01:00
Lukas W
d4a8f6c95b More name & site fixes 2014-11-05 00:41:02 +01:00
Umcaruje
6fb923cba2 Correct the program name and site in the descriptions. 2014-11-04 22:56:50 +01:00
Tres Finocchiaro
1826ced3d2 Fix automation cursor position issue 2014-11-04 00:13:38 -05:00
Vesa V
d3ae2e5721 Merge pull request #1264 from floft/configrename 
Last configManager to ConfigManager rename
 2014-11-03 22:36:38 +02:00
Garrett
6c91679de4 Last configManager to ConfigManager rename 2014-11-03 08:21:30 -08:00
Vesa
fa9674521e Merge branch 'stable-1.1' 
Conflicts:
	src/core/main.cpp
	src/gui/MainWindow.cpp
 2014-11-02 07:46:32 +02:00
Vesa V
e801376ff4 Merge pull request #1250 from Lukas-W/stable-1.1-iss1065 
Ask for saving changes before opening recent project
 2014-11-02 07:40:39 +02:00
Vesa V
e7fbe3a2d4 Merge pull request #1253 from softrabbit/issue722 
Make autosave file name the same for save and load
 2014-11-02 07:39:20 +02:00
Vesa V
671833a1dd Merge pull request #1260 from LMMS/master-configmgr 
Config Manager updates
 2014-11-02 07:36:25 +02:00
Lukas W
f6f44d0c5c Rename ConfigManager files (3) 2014-11-02 01:26:46 +01:00
Lukas W
47831c99c5 Rename ConfigManager files (2) 2014-11-02 01:08:27 +01:00
Lukas W
c9c8bf1c77 Rename ConfigManager files (1) 2014-11-02 01:06:13 +01:00
Lukas W
100a67cd3c Rename configManager to ConfigManager 2014-11-02 01:02:33 +01:00
Lukas W
d68671a6c2 Code style updates 2014-11-02 00:57:19 +01:00
Lukas W
2e66c88edf Store recovery file path in configManager 2014-11-02 00:51:24 +01:00
Lukas W
053862ffab Fix autosave 
Fix typo made in 2e7733eaa1 while renaming
occurances of "mmp" to "datafile". This lead to a mismatch in the file name
used for saving and reading the recovery file.

Addresses #722
 2014-11-02 00:22:49 +01:00
grindhold
f67e363532 attempt to open broken project does not clear currently open project. fixing #781 2014-11-01 17:36:00 +01:00
grindhold
eea294b8d6 use trimmed metronome sound of @mikobuntu 2014-11-01 12:56:18 +01:00
grindhold
e9174b275a first metronome click of a tact now has a higher pitch #1254 2014-11-01 12:18:27 +01:00
Raine M. Ekman
70cc80a032 Make autosave file name the same for save and load. Fix #722 2014-10-31 20:11:30 +02:00
Lukas W
c682567e4b Ask for saving changes before opening recent project 
Fixes #1065
 2014-10-31 13:35:54 +01:00
Tres Finocchiaro
c5349d40b9 Merge pull request #1247 from tresf/stable-1.1 
New DMG background
 2014-10-30 21:56:53 -04:00
Vesa V
9d3b14e298 Merge pull request #1248 from grindhold/fxmixersolo 
implemented solo-buttons for FxMixer - resolving #1211
 2014-10-31 01:15:34 +02:00
grindhold
865dcc5685 coding style fixes 2014-10-31 00:03:27 +01:00
grindhold
8fe009114d implemented solo-buttons for FxMixer - resolving #1211 2014-10-30 23:43:43 +01:00
Tres Finocchiaro
6c9b87f016 New DMG background 
Closes #1113 (Thanks @Umcaruje)
 2014-10-30 17:02:01 -04:00
Vesa V
540124bde2 Merge pull request #1244 from tresf/stable-1.1 
Cherry pick @grindhold's hand cursor fix
 2014-10-28 19:26:43 +02:00
grindhold
c115b83ff8 fixed hotspot of hand-cursor 2014-10-28 13:23:10 -04:00
grindhold
612abd137a fixed other occurences of hand cursor than beat-editor 2014-10-28 13:22:54 -04:00
Vesa V
431eaa16dc Merge pull request #1243 from grindhold/master 
Fixed hotspot of hand-cursor
 2014-10-28 17:49:07 +02:00
grindhold
05c15dff0c fixed other occurences of hand cursor than beat-editor 2014-10-28 15:32:35 +01:00
grindhold
2c447a32e7 fixed hotspot of hand-cursor 2014-10-28 15:21:22 +01:00
Vesa
240c0b20a6 SF2 fix? 2014-10-28 15:01:00 +02:00
Tobias Doerffel
1f9740201b Merge pull request #1236 from tresf/stable-1.1 
Better name for "dummy" effects
 2014-10-26 22:48:42 +01:00
Tres Finocchiaro
deae0883d2 Fix more whitespace 2014-10-24 09:13:45 -04:00
Tres Finocchiaro
6db78be8ff Fix whitespace 2014-10-24 09:13:17 -04:00
Ubuntu
f601e01811 Turn carla back on :) 2014-10-24 09:12:07 -04:00