mirror/lmms
1
0
Fork 0
mirror of https://github.com/LMMS/lmms.git synced 2026-05-15 02:06:20 -04:00
Code Issues Packages Projects Releases Wiki Activity
3,929 Commits 9 Branches 61 Tags
463f926d4ea1464eec8fd4fdf8565445bc50797f
Commit Graph

467 Commits

Author SHA1 Message Date
Vesa
bf6659fbb1 Merge branch 'stable-1.1' 
Conflicts:
	src/gui/FileBrowser.cpp
 2014-09-09 23:55:39 +03:00
Umcaruje
97c903e76c Added some presets for Monstro, Bitinvader, Watsyn and Kicker. 2014-09-08 00:14:02 +02:00
Vesa
c2d7cf787e Merge branch 'stable-1.1' 
Conflicts:
	include/Plugin.h
	src/core/Plugin.cpp
 2014-09-02 16:59:04 +03:00
Tobias Doerffel
dcdc8d9e3e Added first Monstro preset 2014-09-01 13:37:43 +02:00
Tobias Doerffel
81ca7b157b Merge pull request #1127 from StakeoutPunch/stable-1.1 
More Presets
 2014-09-01 12:15:54 +02:00
StakeoutPunch
f24b82ae62 More Presets 
LB302:
-AcidLead
-AngryLead
-DroneArp
Organic:
-Pwnage
-Rubberband
SID:
-Bass
-CheesyGuitar
-Lead
-MadMind
-Overdrive
-Pad

No presets of any kind were removed or otherwise changed.
 2014-09-01 00:43:37 -05:00
Vesa V
e915bab433 Merge pull request #1100 from StakeoutPunch/stable-1.1 
Updated 3OSC Presets
 2014-08-31 08:05:04 +03:00
StakeoutPunch
f05bff157d Added back stuff 
AmazingBubbles (NC), Freaky-Bass (NC), SawReso (Tweaked), TranceLead
(NC). Removed stupid readme file I added earlier and forgot to delete.
 2014-08-30 23:28:17 -05:00
StakeoutPunch
7ca9dfb065 Added percussion presets (5 total) 
Added Drums_HardKick, Drums_Kick (Vesa's tutorial kick) Drums_HihatO,
Drums_HihatC, Drums_Snare
 2014-08-30 23:09:50 -05:00
Vesa V
52c18dc3c1 Merge pull request #1107 from LMMS/stable-1.1 
sync
 2014-08-28 06:28:36 +03:00
StakeoutPunch
4488977132 Add back SpaceBass 2014-08-26 17:02:46 -05:00
Jaroslav Petrnoušek
6edb5e409a Some more added translations 
Mainly the more visible ones
 2014-08-26 23:04:33 +02:00
Jaroslav Petrnoušek
0b28e6c85d A lot of new and some updated Czech translations 
see diff
 2014-08-26 22:42:52 +02:00
StakeoutPunch
0200cb79b6 Newer folder structure 2014-08-26 10:46:24 -05:00
StakeoutPunch
e84db70722 New folder structure 2014-08-26 10:42:58 -05:00
StakeoutPunch
7c0e7b6c6c Update 3OSC Presets 2014-08-26 01:18:31 -05:00
Vesa
d8cc0cc2cc Merge branch 'stable-1.1' 
Skipped the chinese translation files because of merge conflict, those should be re-submitted for master

Conflicts:
	data/locale/zh.qm
	data/locale/zh.ts
 2014-08-19 09:10:19 +03:00
Tobias Doerffel
d1658a40cb Manually clean XML data in preset files 
Removed old attributes which are not processed anymore.
 2014-08-18 22:19:18 +02:00
Tobias Doerffel
a499670ee2 Upgraded all presets 
Rewrite all preset files with the current version so we can drop some
compat code in DataFile::upgrade() in the future.
 2014-08-18 22:07:34 +02:00
Tobias Doerffel
04f198055f Merge pull request #1077 from zm1990s/stable-1.1 
add Chinese Translations.
 2014-08-17 11:54:21 +02:00
Vesa V
8ac71f7000 Merge pull request #1075 from LMMS/stable-1.1 
sync
 2014-08-16 09:59:48 +03:00
zm1990s
74f3f62bf4 update Chinese 2014-08-15 10:02:23 +08:00
Ian Sannar
0e95a8ceab Remove OldStuff 
Got rid of all but 2 of the songs in OldStuff.
Kept Skeissi-RandomProject12345 because it's cool.
Kept TobyDox-Psycho because it was the first song made in LMMS.
 2014-08-14 11:24:33 -06:00
Ian Sannar
ce0a56a482 Project Files 
Organized, Debugged and Converted everything so it's ready to go for
LMMS 1.1.
 2014-08-14 08:42:12 -06:00
Vesa V
3bbb81cf24 Merge pull request #1036 from LMMS/stable-1.1 
sync
 2014-07-27 19:36:37 +03:00
DeRobyJ
5788e70d47 Italian Localization Update 
All the strings present in the source are updated.
 2014-07-26 16:02:44 +02:00
Vesa V
1934879109 Merge pull request #1026 from LMMS/stable-1.1 
sync
 2014-07-26 00:31:03 +03:00
TonyChyi
124df27ece Add Chinese translation 2014-07-25 23:48:13 +08:00
TonyChyi
3ebea19180 Add Chinese translation 2014-07-25 23:46:13 +08:00
Tobias Doerffel
1b8243ccac Updated ZynAddSubFX instrument presets 
Taken from upstream repository with HEAD at 7e14a008bdc671341843ea720ed.
 2014-07-24 00:06:51 +02:00
Vesa V
8407427c4b Merge pull request #933 from LMMS/stable-1.1 
Stable 1.1
 2014-07-05 16:34:34 +03:00
Vesa
06b47a52a2 Fix styling of textFloat & whatsthis, make text floats consistent in style with tooltips 
Should fix #925
 2014-07-03 14:09:31 +03:00
Vesa V
9c8c80683b Merge pull request #913 from LMMS/stable-1.1 
Syncing...
 2014-06-30 12:49:02 +03:00
Vesa V
4143fc95e4 Merge pull request #912 from LMMS/stable-1.0 
Syncing...
 2014-06-30 12:47:24 +03:00
Vesa
a7bb31159e Merge branch 'stable-1.1' 
Conflicts:
	include/basic_filters.h
	src/core/FxMixer.cpp
 2014-06-28 17:24:23 +03:00
Vesa
31b82fe50b Receive arrow 2014-06-27 23:19:06 +03:00
Vesa
9243d94484 Fix qstring arg 2014-06-27 23:17:21 +03:00
Vesa
a463594bb2 FxMixerView, FxLine: graphics & layout fixes 2014-06-24 21:07:15 +03:00
DeRobyJ
46bb1411d4 Italian Localization Update 
I've updated the Italian translation of the program using Qt linguist.
 2014-06-23 20:31:36 +02:00
Tobias Doerffel
eee2ba7f16 Merge remote-tracking branch 'origin/stable-1.1' 
Conflicts:
	data/locale/de.qm
	data/locale/de.ts
 2014-06-21 23:30:59 +02:00
Tobias Doerffel
6d8890b4ff Merge remote-tracking branch 'origin/stable-1.0' into stable-1.1 2014-06-21 23:29:32 +02:00
Vesa
4bcbb1abcc FxMixer GUI updates: code 2014-06-19 17:59:37 +03:00
Vesa
29c7894993 FxMixer GUI updates: graphics 
Also fixed size of whatsthis
 2014-06-19 17:59:36 +03:00
Vesa
0d2249828d Graphics updates 2014-06-17 12:39:52 +03:00
Tobias Doerffel
e1fc2a21bb Merge pull request #841 from tresf/stable-1.1 
NSIS fixes #385, #831
 2014-06-15 23:30:27 +02:00
tresf
64289f5953 nsis_branding.bmp, 256 color version to fix #831 2014-06-12 02:17:03 -04:00
Tobias Doerffel
3a3cbe4f4e Merge pull request #830 from tresf/stable-1.1 
Updated logo for NSIS installer
 2014-06-11 14:08:17 +02:00
Tres Finocchiaro
045353735f Updated logo for NSIS installer 2014-06-09 11:12:01 -04:00
Tobias Doerffel
019c438668 Merge pull request #817 from diizy/bbtrack-ui 
Make BB-tracks themeable
 2014-06-09 13:41:55 +02:00
Yann Collette
72e194044d update fr translation 2014-06-09 11:08:26 +02:00