Projects/Vocaluxe
2
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,820 Commits 7 Branches 7 Tags
e99f1adfae220ec00e49de2ea83036397c007d5d
Commit Graph
2820 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexander Eckart 37dea565a9 Merge branch 'gstreamer' into develop 2013-03-05 07:43:54 +01:00
Michael W 93f2866ead fixed duet lyrics disappearing when cycling player info display 2013-03-03 19:31:28 +01:00
derivator fa43eaa119 Merge pull request #1 from xDarkice/gstreamer 
Gstreamer
 2013-03-03 06:10:23 -08:00
Michael W 38a7a2208e fixed fading bug 2013-03-03 14:38:31 +01:00
Stephan Sundermann 1f01e27135 Fixed memory leaks in Close() 2013-03-01 17:42:48 +01:00
Alexander Eckart 522bbff2c0 Merge branch 'gstreamer' into develop 2013-03-01 16:54:09 +01:00
Stephan Sundermann 0594871404 Merge remote-tracking branch 'remotes/origin/gstreamer' into gstreamer 2013-02-28 23:29:26 +01:00
Stephan Sundermann b7b0e7f7ef Load does no longer block, refs #8 2013-02-28 23:27:12 +01:00
Flamefire 51da50bf93 Merge remote-tracking branch 'remotes/origin/develop' into develop 
Conflicts:
	Vocaluxe.sln
	Vocaluxe/Base/CConfig.cs
 2013-02-28 14:13:53 +01:00
Flamefire 3101897f57 Merge branch 'Sort_Optimizings' into develop 2013-02-28 14:00:46 +01:00
Flamefire c377ec0eef Added Classes for categorizing, filtering and sorting 2013-02-28 00:47:46 +01:00
Florian Küpper fca2254267 Merge branch 'develop' of github.com:Vocaluxe/Vocaluxe into develop 2013-02-27 18:51:20 +01:00
Alexander Eckart 56bde936b9 try to fix bug #11 
please test
 2013-02-27 18:44:24 +01:00
Flamefire dbb9c6355f Added option to start current song/enter current category 
Added CSong.IsInCategory
 2013-02-27 01:03:33 +01:00
Flamefire 30841c5758 SongMenu refactoring 
New Shortcuts
Readme update
 2013-02-26 21:12:32 +01:00
Flamefire 835af557d2 Merge branch 'Sort_Optimizings' into develop 2013-02-26 18:36:35 +01:00
Flamefire d2f8af880e Bugfixes for CDataBase/COpenGL 
Changed dynamic song loading to not use a thread as it was not threadsafe before
 2013-02-26 18:22:18 +01:00
Flamefire bd3f51b17e Refactored AddTexture to remove duplicate code 2013-02-26 18:04:39 +01:00
Flamefire 3ebd34fcc3 Made the code checker a bit happier 2013-02-26 16:25:29 +01:00
Flamefire d5cb43a09f Little Tweaks 2013-02-25 23:22:01 +01:00
Alexander Eckart c3fcd71589 Merge branch 'Flamefire/develop' into develop 
Conflicts:
	VocaluxeLib/Menu/SongMenu/CSong.cs
 2013-02-25 22:50:38 +01:00
Flamefire 13e856db16 Made CXMLReader.OpenFile private so factory method has to be used 2013-02-25 20:15:24 +01:00
Flamefire 78870ae26d CHelper now fully static 2013-02-25 19:54:00 +01:00
Flamefire e6f70daf63 Further simplification of sorting/filtering 2013-02-25 19:34:56 +01:00
Flamefire ce9e426bae Refactored sorting and filtering 2013-02-25 00:17:14 +01:00
Alexander Eckart ce46c75415 Merge remote-tracking branch 'remotes/flokuep/develop' into develop 2013-02-24 20:05:42 +01:00
Florian Küpper 9649ba97a1 Merge branch 'develop' of github.com:Vocaluxe/Vocaluxe into develop 2013-02-24 19:13:11 +01:00
Alexander Eckart 4accb26538 fixed handling of CoverBig for category covers 2013-02-24 19:09:15 +01:00
Alexander Eckart baea1cd7eb Merge branch 'Better_note_timing' into develop 2013-02-24 18:50:58 +01:00
Flamefire 22d6eb7487 Fix cover load counter 2013-02-23 20:36:36 +01:00
Flamefire 42ff24cbf2 Easier sing-note adding 2013-02-23 18:12:23 +01:00
Flamefire dfe73d6dea Using binary search for note timing 2013-02-23 17:46:06 +01:00
Flamefire f50ebd09e1 Changed Note/Line adding to be sorted in all cases 2013-02-23 17:33:21 +01:00
Flamefire b44b57b158 Reflection Fix 2013-02-23 15:16:48 +01:00
Flamefire 24922e8c05 Merge commit '6be397ac5b9b475b35c008e10a6464f7b33da752' into Better_note_timing 
Conflicts:
	VocaluxeLib/Menu/SongMenu/CSong.cs
	VocaluxeLib/Menu/SongMenu/CSongMenuTileBoard.cs
 2013-02-23 14:26:52 +01:00
Florian Küpper e20bd7093f Added option to config.xml for switching bg-music start-tag behavior. 2013-02-23 14:13:49 +01:00
Flamefire 5ff1677563 Cover loading refactored 
Fixed song loading check
Correct use of CoverTextureBig
 2013-02-23 14:04:38 +01:00
Florian Küpper 4420a11b08 Fixed video in bg-music with start-tag. 2013-02-23 14:03:57 +01:00
Florian Küpper 08e2f8245b Merge branch 'develop' of github.com:Vocaluxe/Vocaluxe into develop 2013-02-23 13:16:52 +01:00
Alexander Eckart fe600f5a70 Merge branch 'gstreamer' into develop 
Conflicts:
	Output/x64/gstreamer/GstreamerHelper.dll
 2013-02-23 11:33:31 +01:00
Stephan Sundermann f5a510f10e Disabled /SAFESEF for x86 release configuration, refs #1 2013-02-23 11:21:36 +01:00
Alexander Eckart 5747847fe5 Merge branch 'gstreamer' into develop 2013-02-23 11:11:08 +01:00
Stephan Sundermann bd6687c2b6 Added missing lib file for x86 
Fixed project build options for x64 release mode
refs #1
 2013-02-23 01:31:17 +01:00
Florian Küpper 0fa5b69682 Merge branch 'develop' of github.com:Vocaluxe/Vocaluxe into develop 2013-02-23 00:09:50 +01:00
Florian Küpper d227490124 Fix starting bg-music when disabled on start. 2013-02-23 00:07:28 +01:00
Florian Küpper 0d79abcda8 Fix some errors with volume-control, closes #10 2013-02-22 23:56:33 +01:00
Flamefire 9761c115b2 Refactored song loading 
~9% faster and a bit more stable
 2013-02-22 23:19:13 +01:00
Alexander Eckart 69e5537f76 Merge remote-tracking branch 'remotes/xdarkice/gstreamer' into develop 
Conflicts:
	VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs

Set GStreamer as default audio decoder
 2013-02-22 22:29:05 +01:00
Alexander Eckart 6be397ac5b added a name for the 0.3 release 2013-02-22 22:10:51 +01:00
Alexander Eckart f33aee9c14 Merge remote-tracking branch 'remotes/flokuep/develop' into develop 2013-02-22 22:04:12 +01:00