 Flamefire
|
73e4a9fa74
|
Merge branch 'release-0.3' into develop
Conflicts:
Vocaluxe/Base/CConfig.cs
Vocaluxe/Lib/Playlist/CPlaylistFile.cs
Vocaluxe/Screens/CScreenSong.cs
VocaluxeLib/CHelper.cs
VocaluxeLib/Menu/CMenu.cs
VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs
VocaluxeLib/Menu/SongMenu/CSongMenuTileBoard.cs
|
2013-10-19 00:42:56 +02:00 |
|
|
Flamefire
|
155718456c
|
Fix file-not-found exception
|
2013-10-18 21:29:43 +02:00 |
|
|
Flamefire
|
1702859e79
|
Write decimals in international format
No warning on #RESOLUTION tag
|
2013-10-14 21:55:26 +02:00 |
|
|
Flamefire
|
87ba525811
|
Fix for SongWriter
|
2013-10-12 18:08:46 +02:00 |
|
|
Flamefire
|
ed22088728
|
Split CSong to have single file for note and header reading.
Some simpler assignments and more error checking
|
2013-10-11 14:50:28 +02:00 |
|
|
Flamefire
|
370964ee99
|
Fix file headers and indentations
|
2013-09-20 18:09:32 +02:00 |
|
|
Flamefire
|
762d2c80d2
|
Code cleanup
Added license stuff
|
2013-08-22 00:56:58 +02:00 |
|
|
Alexander Eckart
|
ca5fc16332
|
fixed loading songs (TryReadInt)
|
2013-06-06 21:34:06 +02:00 |
|
|
Flamefire
|
11398dbb2f
|
Cleanups after merge
|
2013-05-19 18:38:50 +02:00 |
|
|
Flamefire
|
9d13c32b93
|
Merge branch 'Better_Graphics_Handling' into develop
Conflicts:
Vocaluxe/Base/CBackgroundMusic.cs
Vocaluxe/Base/CCover.cs
Vocaluxe/Base/CDataBase.cs
Vocaluxe/Base/CDraw.cs
Vocaluxe/Base/CMain.cs
Vocaluxe/Base/CProfiles.cs
Vocaluxe/Base/CTheme.cs
Vocaluxe/Base/CVideo.cs
Vocaluxe/Base/CWebcam.cs
Vocaluxe/Base/Fonts/CFont.cs
Vocaluxe/Base/Fonts/CGlyph.cs
Vocaluxe/Lib/Draw/CDirect3D.cs
Vocaluxe/Lib/Draw/CDrawWinForm.cs
Vocaluxe/Lib/Draw/COpenGL.cs
Vocaluxe/Lib/Draw/IDraw.cs
Vocaluxe/Lib/Video/CVideoDecoder.cs
Vocaluxe/Lib/Video/CVideoDecoderFFmpeg.cs
Vocaluxe/Lib/Video/CVideoDecoderGstreamer.cs
Vocaluxe/Lib/Video/IVideoDecoder.cs
Vocaluxe/Lib/Webcam/CAForgeNet.cs
Vocaluxe/Lib/Webcam/IWebcam.cs
Vocaluxe/Screens/CScreenCredits.cs
Vocaluxe/Screens/CScreenNames.cs
Vocaluxe/Screens/CScreenOptionsVideo.cs
Vocaluxe/Screens/CScreenProfiles.cs
Vocaluxe/Screens/CScreenSing.cs
VocaluxeLib/Menu/IMenu.cs
VocaluxeLib/Songs/CCategory.cs
VocaluxeLib/Songs/CSong.cs
VocaluxeLib/Structs.cs
VocaluxeLib/VocaluxeLib.csproj
|
2013-05-19 17:53:46 +02:00 |
|
|
Alexander Eckart
|
ed3047314b
|
finished moving around
|
2013-05-06 23:18:02 +02:00 |
|
|
Alexander Eckart
|
685bc019fd
|
moved some files
|
2013-05-06 23:11:56 +02:00 |
|