Commit Graph
22 Commits
Author SHA1 Message Date
kennyboy55 c2afd44654 Merge remote-tracking branch 'origin/gui' into gui
Conflicts:
	MusicPlayer/MusicPlayer/MainForm.Designer.cs
	MusicPlayer/MusicPlayer/MainForm.cs
2015-10-29 23:45:57 +01:00
kennyboy55 4f5aaee125 Added visuals for buffering and position 2015-10-29 23:43:42 +01:00
kennyboy55 1f2983d712 Better Audio Handling 2015-10-29 22:48:54 +01:00
kennyboy55 615934557c Added more audio handling 2015-10-29 22:27:12 +01:00
kennyboy55 6d9af7c614 Merge remote-tracking branch 'origin/gui' into gui 2015-10-29 21:40:08 +01:00
kennyboy55 5e40a1e7a3 Merge branch 'developer' into gui
Conflicts:
	MusicPlayer/MusicPlayer/Program.cs
2015-10-29 21:39:54 +01:00
kennyboy55 ada4321bca Change to public. New Structure. 2015-10-29 21:21:35 +01:00
kennyboy55 f79b2ace28 Changed Structure 2015-10-29 20:55:36 +01:00
kennyboy55 9108f17acc Merge branch 'developer' into gui
Conflicts:
	MusicPlayer/MusicPlayer/MusicPlayer.csproj
2015-10-29 20:47:00 +01:00
kennyboy55 9f64137e68 Added new stuff 2015-10-29 20:45:23 +01:00
kennyboy55 a45d506dbc Added controls panel and playing of music 2015-10-29 20:12:59 +01:00
kennyboy55 23a7373338 Merge branch 'developer' into gui 2015-10-29 19:55:45 +01:00
kennyboy55 436ae2d96c Update README.md 2015-10-29 19:38:12 +01:00
kennyboy55 853d2f452d Create README.md 2015-10-29 19:37:31 +01:00
kennyboy55 5491f1d165 Updated GUI 2015-10-15 14:52:10 +02:00
kennyboy55 6acb6ecd7a Bugfixes 2015-10-15 14:11:16 +02:00
kennyboy55 3f1483beeb Fixed file 2015-10-15 14:07:47 +02:00
kennyboy55 3cc9bcffb3 Merge branch 'developer' into gui
Conflicts:
	MusicPlayer/MusicPlayer/MusicPlayer.csproj
2015-10-15 14:03:59 +02:00
kennyboy55 c2e603efaf Added Jsonsoft Nuget! 2015-10-15 13:58:08 +02:00
kennyboy55 9a84ae5586 Added missing files 2015-10-15 13:45:57 +02:00
kennyboy55 bfc01b635f Added first gui version 2015-10-15 13:42:12 +02:00
kennyboy55 67c7e13812 First commit 2015-10-15 12:59:35 +02:00