Flamefire
5787839b95
Introduce class for error log
2014-03-10 20:04:03 +01:00
Flamefire
90ba1188d3
Add more log files to distinguish between classes of messages
2014-03-09 20:07:28 +01:00
Flamefire
24ca4edab7
Make Logfile more thread save
2014-03-09 19:49:06 +01:00
Flamefire
149026ec32
IMPORTANT: Format of all files with Resharper
...
NO functional changes. If you have problems merging your changes, merge/rebase on previous commit then merge this. Conflicts can easily be resolved (take yours if in doubt)
After that merge next commits
2014-02-26 00:36:00 +01:00
Flamefire
3a110804d8
Update Re#er settings
2014-02-26 00:31:34 +01:00
Flamefire
2458e1834a
Fix merge error
...
Formatting
2014-02-25 21:04:44 +01:00
Flamefire
d4dc4f7c20
Merge branch 'develop' of git://github.com/Vocaluxe/Vocaluxe into develop
...
Conflicts:
ClientServerLib/ClientServerLib/CServer.cs
2014-02-25 21:01:21 +01:00
Flamefire
1b5f504763
Add missing string
2014-02-15 14:56:25 +01:00
Flamefire
a677a1ad8b
Add firewall rules always and also to private section (won't work otherwise)
2014-02-15 14:15:10 +01:00
Flamefire
14db90b91c
Fix output dir of serverconfig
2014-02-15 14:14:41 +01:00
Flamefire
89a1e3056b
Remove old files
2014-02-15 14:14:21 +01:00
Flamefire
8b1b44ad49
Refactoring to make names conistent and remove warnings
2014-02-15 13:08:24 +01:00
Flamefire
ff8fa48f3c
Fix warnings
2014-02-15 12:40:16 +01:00
Flamefire
f3c713416c
Use autopropertys in server
2014-02-15 12:38:31 +01:00
Flamefire
b8629c1a74
Update gitignore
2014-02-15 12:36:07 +01:00
Flamefire
381b2aeee6
Fix ServerConfig project
2014-02-15 12:35:09 +01:00
Flamefire
43a82e95d7
Fix typo in languages
2014-02-15 12:11:48 +01:00
Flamefire
d27648829b
Merge branch 'release-0.3' into develop
2013-10-24 19:44:39 +02:00
Flamefire
a7115df8f5
Make use of mutex to ensure single instance (more robust and faster)
2013-10-24 19:44:03 +02:00
Flamefire
d14c8fd37e
Merge branch 'release-0.3' into develop
2013-10-21 15:51:10 +02:00
Flamefire
c4d0bcd723
Rework on the ffmpeg video decoder (Bg were videos flickering? Can't reproduce)
2013-10-21 15:31:20 +02:00
Flamefire
5a5d94d18b
Add documentation for Video/IVideoDecoder.cs
2013-10-21 15:30:32 +02:00
Flamefire
6ad023a88e
Merge branch 'release-0.3' into develop
2013-10-20 13:56:16 +02:00
Flamefire
960d511186
Return only true if we got a new video frame (Decoder framework might need a redesign or at least some docu how it is supposed to work)
2013-10-20 13:55:43 +02:00
Flamefire
4eef1df0aa
Merge branch 'release-0.3' of git://github.com/Vocaluxe/Vocaluxe into release-0.3
...
Conflicts:
Vocaluxe/Base/CConfig.cs
2013-10-19 03:25:49 +02:00
Flamefire
ef9bda2c52
Merge branch 'develop' of git://github.com/Vocaluxe/Vocaluxe into develop
2013-10-19 03:21:09 +02:00
Flamefire
7c68e049f4
Bump version to 0.8.2
2013-10-19 03:16:35 +02:00
Flamefire
ab152d618d
Merge branch 'release-0.3' into develop
2013-10-19 03:14:21 +02:00
Flamefire
62e8d125c9
Workaround missing length even with prescan on gestreamer
2013-10-19 03:13:52 +02:00
Flamefire
dbcd79af79
Merge branch 'release-0.3' into develop
...
Conflicts:
VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs
2013-10-19 02:12:29 +02:00
Flamefire
21f6213c1a
Fix preview start after song end
2013-10-19 02:04:58 +02:00
Flamefire
83b72604a9
Remove confusing ActSongId
2013-10-19 02:02:53 +02:00
Flamefire
4c82446019
Bugfix on Init() function of song Menu
...
Refactoring w/o functional changes
2013-10-19 01:49:34 +02:00
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
02825cf46a
Update preview only when necessary
2013-10-19 00:06:52 +02:00
Flamefire
3466c09851
Remove redundant code
2013-10-18 23:59:37 +02:00
Flamefire
03d92a474c
Remove PreviewId pending stuff (don't need that. If you need a fade or something implement it properly with timer, event... But PreviewId should really be the current preview element)
2013-10-18 23:58:15 +02:00
Flamefire
60bd2c4da4
Rename PreviewSelected to more meaningful PreviewId
2013-10-18 23:50:47 +02:00
Flamefire
3a8acecd5c
Use always the same xml writer settings
2013-10-18 23:40:23 +02:00
Flamefire
3b82d5c13c
Fix for inconsistent song Menu
...
Multiple refactoring due to ambiguous meanings
2013-10-18 23:25:42 +02:00
Flamefire
155718456c
Fix file-not-found exception
2013-10-18 21:29:43 +02:00
Flamefire
4dd9f44f3d
Fix showing of song menu if not in category
2013-10-18 21:29:06 +02:00
Flamefire
c2462d723a
Fix weird formatting in CScreenSong.cs (no code changes)
2013-10-18 21:18:45 +02:00
Flamefire
91afb830b5
Merge branch 'SongLoader' into develop
2013-10-14 22:02:18 +02:00
Flamefire
4e12e2624f
Merge branch 'release-0.3' into develop
2013-10-14 22:02:02 +02:00
Flamefire
6945ac1e07
Merge branch 'release-0.3' of git://github.com/flokuep/Vocaluxe into release-0.3
2013-10-14 22:00:09 +02:00
Flamefire
1702859e79
Write decimals in international format
...
No warning on #RESOLUTION tag
2013-10-14 21:55:26 +02:00
Flamefire
d41779b6f2
Fix wrong comparisons
2013-10-13 00:27:03 +02:00
Flamefire
42ac648fc1
Remove txt on saved songs
...
Detect also gif images automatically
2013-10-12 23:10:11 +02:00
Flamefire
6e9db6ed98
Write correct tag
...
No newline in LogError (could do it manually)
2013-10-12 22:47:08 +02:00
Flamefire
6de23ea428
Use IsGameModeAvail for duet check
2013-10-12 21:50:39 +02:00
Flamefire
b12e4156fa
Allow #ENDSHORT tags
...
Detect where Preview and ShortEnd came from
Introduce a function to check whether a given GameMode is available for a song
2013-10-12 21:42:03 +02:00
Flamefire
87ba525811
Fix for SongWriter
2013-10-12 18:08:46 +02:00
Flamefire
cc6d921f03
Implement config var
...
Implement SongWriter and Song.Save()
2013-10-12 17:32:24 +02:00
Flamefire
b0cb402dc3
Support #SOURCE, #ALBUM
...
Write #COMMENT
Keep unknown tags/lines
2013-10-12 16:10:24 +02:00
Flamefire
0a97a2e46d
Fix renaming of Editions etc.
2013-10-12 14:50:10 +02:00
Flamefire
da91f177eb
Read more than 2 voice names
2013-10-11 20:25:56 +02:00
Flamefire
8e80cf93e2
Add Songwriter and #PREVIEW tag
2013-10-11 20:25:05 +02:00
Flamefire
d498e0b935
Remove empty lines from Songs (causes problems otherwise!)
...
Compatibility reading mode for songs with 0-based lengths
Give Lines as an enumerable instead of creating an array
2013-10-11 19:19:42 +02:00
Flamefire
a9b3e1d3f8
Simplify song-image detection
...
Store comment as 1 string
2013-10-11 14:50:31 +02:00
Flamefire
2ec094e734
Easier logging in SongLoader
2013-10-11 14:50:31 +02:00
Flamefire
05e170e91a
Rename SongLoader file
2013-10-11 14:50:30 +02:00
Flamefire
3c2d7dcafd
Introduce SongLoader class as some fields are only required while loading
...
Change relative to be a bool
2013-10-11 14:50:30 +02:00
Flamefire
31976ed498
Debug showcase for line break ordering
2013-10-11 14:50:29 +02:00
Flamefire
bbe8cfbe08
Do not add line before first line
...
Calculate start beat automatically
More stable note loading with better warnings
2013-10-11 14:50:29 +02:00
Flamefire
ee6aaebfbc
Use actual set encoding
2013-10-11 14:50:28 +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
55d5c61a66
Fix overlapping notes
...
More consistent CLyric
Some renaming for clearer meaning
2013-10-11 14:50:27 +02:00
Flamefire
bf1c00b5d1
Some fixes and support for more than 2 voices
2013-10-11 14:50:27 +02:00
Flamefire
8890176e97
Merge branch 'release-0.3' into develop
2013-10-03 13:26:00 +02:00
Flamefire
ee11aca2af
Add requirement checks at program start.
2013-10-03 13:23:49 +02:00
Flamefire
3fbc5994b1
Remove unnecessary golden property
2013-09-20 19:54:25 +02:00
Flamefire
148aa0072d
Fix points animation
2013-09-20 19:32:50 +02:00
Flamefire
63ef16b0a7
Fix already sung points calculation
2013-09-20 19:12:03 +02:00
Flamefire
370964ee99
Fix file headers and indentations
2013-09-20 18:09:32 +02:00
Flamefire
db9f04cad6
Some name refactoring for clearer meaning (also docu)
2013-09-20 17:57:34 +02:00
Flamefire
762d2c80d2
Code cleanup
...
Added license stuff
2013-08-22 00:56:58 +02:00
Flamefire
cd826bdafd
Merge remote-tracking branch 'remotes/flokuep/release-0.3' into develop
...
Conflicts:
Vocaluxe/Base/CDataBase.cs
2013-08-22 00:43:53 +02:00
Flamefire
44c78fad19
Split Notes, Lines and Voices into separate files/classes
2013-08-22 00:05:01 +02:00
Flamefire
8574314fa5
Merge branch 'FFMpeg_Video_Improvement' into develop
2013-05-27 19:02:56 +02:00
Flamefire
2b3a5d3416
Merge branch 'develop' of git://github.com/Vocaluxe/Vocaluxe into develop
2013-05-27 19:02:45 +02:00
Flamefire
1aff7f5e3e
Improved skipping of frames
2013-05-26 02:46:40 +02:00
Flamefire
382429ab5e
Removed video lock (decoder list is used just from main thread)
2013-05-26 01:23:49 +02:00
Flamefire
b493a1f3d7
Fixed dropFrames count
2013-05-26 01:18:43 +02:00
Flamefire
acb8862361
Don't load a video just to pause it
...
Fixed bug with video sleeping
2013-05-26 01:14:41 +02:00
Flamefire
ac9f1a7c96
Fixed video config setting
2013-05-26 01:00:38 +02:00
Flamefire
91ebcce18c
Removed unnecessary lock
2013-05-26 00:40:59 +02:00
Flamefire
517db7d43b
Added CFramebuffer.cs
...
Introduced Thread waiting for unused videos
2013-05-26 00:17:47 +02:00
Flamefire
1c2f67fce2
Changed current frame selection
2013-05-23 01:09:59 +02:00
Flamefire
aead91d11d
Variable renamings
...
Cleanup
Restructuration
2013-05-23 00:50:07 +02:00
Flamefire
8cfeec628f
Fixed typo
2013-05-22 01:33:20 +02:00
Flamefire
8b71dec2ca
Video list -> Dictionary for faster access
2013-05-22 01:19:55 +02:00
Flamefire
284b46819f
Converted SSkinElement to a class (no pointless copies)
2013-05-22 00:44:13 +02:00
Flamefire
ac8b7dc940
Improved video loading
2013-05-22 00:24:22 +02:00
Flamefire
389aecd772
Removed useless CVideoDecoder.cs
...
Cleanup of FFMpeg Class
2013-05-21 23:55:18 +02:00
Flamefire
26bfadde64
Moved CDecoder.cs
2013-05-21 22:36:18 +02:00
Flamefire
9704a1aeb0
Fixed D3D
2013-05-20 19:10:49 +02:00
Flamefire
11398dbb2f
Cleanups after merge
2013-05-19 18:38:50 +02:00
Flamefire
f83496d66a
Fixed merge errors
2013-05-19 18:03:29 +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