mirror/lmms
1
0 Fork 0
mirror of https://github.com/LMMS/lmms.git synced 2026-10-09 10:22:13 -04:00
Code Issues Packages Projects Releases Wiki Activity
4,155 Commits 9 Branches 62 Tags
9fe55161a83defb76d33ea751a03103362fbb607
Commit Graph
500 Commits
Author SHA1 Message Date
Vesa 6f963159df Merge branch 'stable-1.1' 
Conflicts:
	data/locale/zh.ts
 2014-11-18 10:52:40 +02:00
LYF610400210 46b86e70ae [Translation] zh.ts 2014-11-18 15:39:43 +08:00
Vesa e6938994cd Merge branch 'stable-1.1' 2014-11-18 09:22:25 +02:00
Tobias Doerffel 9f56ba966d Merge pull request #1296 from ma2moto/patch-2 
Update ja.ts
 2014-11-17 22:24:45 +01:00
Vesa dfb89c8c92 Merge branch 'stable-1.1' 
Conflicts:
	data/locale/de.qm
	data/locale/de.ts
	src/gui/FxMixerView.cpp
 2014-11-17 13:25:45 +02:00
Daniel Winzen 612185a2c6 Updated German translation 2014-11-16 16:31:48 +01:00
Vesa 740a7e6850 Merge branch 'stable-1.1' 
Conflicts:
	include/AutomatableModel.h
	include/FxMixer.h
	src/core/FxMixer.cpp
	src/gui/widgets/caption_menu.cpp
	src/tracks/InstrumentTrack.cpp
 2014-11-16 15:16:40 +02:00
Lukas W 9005dc39ca Caption menu style fix 2014-11-15 17:46:07 +01:00
ma2moto f4da924211 Update ja.ts 2014-11-14 22:33:14 +09:00
Vesa 16fb09fb94 Merge branch 'stable-1.1' 2014-11-10 20:33:02 +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 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
Vesa fa9674521e Merge branch 'stable-1.1' 
Conflicts:
	src/core/main.cpp
	src/gui/MainWindow.cpp
 2014-11-02 07:46:32 +02: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
Tres Finocchiaro 6c9b87f016 New DMG background 
Closes #1113 (Thanks @Umcaruje)
 2014-10-30 17:02:01 -04:00
Vesa b084e91345 Merge branch 'stable-1.1' 
Conflicts:
	data/locale/de.qm
	data/locale/zh.qm
	data/locale/zh.ts
 2014-10-19 14:58:23 +03:00
ma2moto 100b26a7a3 Update ja.ts 2014-10-19 19:39:55 +09:00
ma2moto 9c9036e10f Update ja.ts 2014-10-19 17:47:36 +09:00
ma2moto f3f8f16104 Update ja.ts 2014-10-19 09:51:47 +09:00
ma2moto 2302528690 Update ja.ts 2014-10-19 09:26:34 +09:00
ma2moto bb6130d52e Update ja.ts 2014-10-19 09:17:52 +09:00
ma2moto 8b860c4360 Update ja.ts 2014-10-19 08:56:35 +09:00
Lukas W 4e0c06442a Reflect project rename in code 
Related to #1209
 2014-10-17 16:17:40 +02:00
Tobias Doerffel 2da7804c82 Merge remote-tracking branch 'origin/stable-1.1' 2014-09-30 23:00:09 +02:00
Tobias Doerffel 71cdf06923 Refreshed localization files 2014-09-30 22:56:27 +02:00
Tobias Doerffel eb2c47f81d Refreshed localization files 2014-09-30 22:55:29 +02:00
Tobias Doerffel f2876ea650 Merge remote-tracking branch 'origin/stable-1.1' 
Conflicts:
	data/locale/zh.ts
	src/tracks/Pattern.cpp
 2014-09-30 22:53:24 +02:00
Tobias Doerffel de45718351 Renamed pattern/patternView to Pattern/PatternView 2014-09-30 22:49:16 +02:00
Tobias Doerffel 606879421b Merge remote-tracking branch 'origin/stable-1.1' 
Conflicts:
	README.md
 2014-09-28 18:12:04 +02:00
Spekular 6b54a4bcc1 Background Art Fix 
Fixes Background art and provides .svg source
 2014-09-28 10:04:02 +02:00
Stian Jørgensrud af1b351dd2 Added Popsip-Electric Dancer to CoolSongs 2014-09-14 21:09:45 +02:00
Stian Jørgensrud 09656a46e7 Corrected name error in Cool Songs 
From Skeissi to Skiessi
 2014-09-11 11:54:58 +02:00
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