Commit Graph
379 Commits
Author SHA1 Message Date
Florian Kuepper df0688d563 Merge remote-tracking branch 'upstream/develop' into 6-player 2012-04-09 11:07:22 +02:00
Alexander Eckart 8d53e31c74 Merge branch 'develop' into medley 2012-04-08 20:09:51 +02:00
Alexander Eckart 14aa49d65d Merge branch 'develop' into popup-control
Conflicts:
	Vocaluxe/Program.cs
2012-04-08 20:06:56 +02:00
Alexander Eckart 1e0120faab ffmpeg update 2012-04-06 13:38:53 +02:00
Florian Kuepper 999923bbd9 Fix colors on ScoreScreen. 2012-04-02 22:53:49 +02:00
Florian Kuepper 02ed1e9b0b Fix wrong color on SingScreen. 2012-04-02 18:45:12 +02:00
Florian Kuepper 0ac0ce49d0 Change color for player 5. 2012-04-02 18:43:49 +02:00
Florian Kuepper f2dbe6c965 Some theme adjustments.... 2012-04-01 23:52:22 +02:00
Florian Kuepper aba9c97988 Finished Score-Screen for 6 players. 2012-03-31 12:36:37 +02:00
Florian Kuepper 4affefa133 Finished 5-player on ScoreScreen. 2012-03-31 11:03:23 +02:00
Florian Kuepper 0456eb6493 First step of 6-player-singing. Maybe very unstable, buggy and busy. There is still a lot to to do:
- NamesScreen (Drag/Drop-Visibility, Scrolling, Using Keyboard...)
- ScoreScreen (For 5+6 players)

But please check and test :)
2012-03-31 00:34:12 +02:00
Alexander Eckart a986686467 added medley icons (we need some nicer icons) 2012-03-24 18:24:21 +01:00
Alexander Eckart 8cdc2b13bc Merge branch 'develop' into popup-control 2012-03-24 17:12:50 +01:00
Alexander Eckart 26cabd32d6 readme update 2012-03-23 15:00:38 +01:00
Alexander Eckart 65068fd729 added some more colors to player selection screen (by Fred) 2012-03-23 14:49:44 +01:00
Alexander Eckart 85db3a47a4 player colors for play selection slides 2012-03-22 17:18:17 +01:00
Alexander Eckart 1a15c51e41 update of ffmpeg, the mkv bug is fixed! 2012-03-21 21:09:40 +01:00
Alexander Eckart faa7ebb964 Merge branch 'develop' into popup-control 2012-03-21 16:21:08 +01:00
Alexander Eckart 0dc51aefc0 slightly better contrast for time bar in sing screen 2012-03-19 20:36:25 +01:00
Alexander Eckart 46dac3f734 fixed player 3 color (thx to pinky007) 2012-03-19 20:06:33 +01:00
Stephan Sundermann 8d95693e28 Use new outline text option 2012-03-12 23:14:44 +01:00
unknown ed2d303466 Merge branch 'release-0.1' of github.com:Vocaluxe/Vocaluxe into jukebox 2012-03-12 22:51:54 +01:00
Alexander Eckart 89aa513ed7 higher outline to outline font 2012-03-12 21:13:07 +01:00
Alexander Eckart df04153d4b removed outline font from lyrics (perhaps later with another font) 2012-03-12 21:11:26 +01:00
Alexander Eckart a88dd88754 added outline font support, changed theme system version to 5,
updated ambient theme with outline fonts
2012-03-12 20:55:35 +01:00
Alexander Eckart 6d2cde3b86 added github wiki url to readme 2012-03-11 12:16:36 +01:00
Alexander Eckart 70c2999adf added new portaudio (x86) dll 2012-03-10 14:08:38 +01:00
Stephan Sundermann 16e2be8fd9 Merge branch 'develop' of https://github.com/Vocaluxe/Vocaluxe into jukebox 2012-03-10 12:58:34 +01:00
Stephan Sundermann 4a37ca024e Video modes are now handled separately
PortAudio.dll library update
2012-03-08 19:16:49 +01:00
Alexander Eckart f5c7bcda03 Merge remote-tracking branch 'flokuep/release-0.1' into release-0.1 2012-03-08 16:58:07 +01:00
Stephan Sundermann 4a9362958a Added changelog and increased screenversion 2012-03-06 22:03:52 +01:00
Stephan Sundermann c6574a3743 VideosToBackground is now saved in CConfig and will start up automatically if set 2012-03-06 21:26:15 +01:00
Alexander Eckart 95053bbed8 update of spanish translation 2012-03-06 18:27:28 +01:00
Stephan Sundermann edf0249951 Added the option to use the current backgroundmusic's video as background. Icon for that option is needed! 2012-03-06 16:59:43 +01:00
Stephan Sundermann 88ae7d86c8 Some minor changes 2012-03-05 19:24:42 +01:00
Stephan Sundermann 9addfa0957 Added new Options ShowVideo and Sing, ShowVideo is not working yet, need icon for sing button! 2012-03-05 13:59:28 +01:00
Florian Kuepper 0b95eb8997 Merge remote-tracking branch 'upstream/release-0.1' into release-0.1 2012-03-04 14:19:00 +01:00
Florian Kuepper f97072df6a Forget to add changelog. 2012-03-04 14:18:24 +01:00
Florian Kuepper b8833b6199 Change ScreenOptionsSound-Version to 2 and added changelog. 2012-03-04 14:17:30 +01:00
Alexander Eckart 35d32272a2 update of readme 2012-03-04 14:00:14 +01:00
Alexander Eckart 937804c7a9 update of readme 2012-03-04 13:52:31 +01:00
Florian Kuepper a0ce6f548a Change some graphics. 2012-03-04 13:47:39 +01:00
Florian Kuepper c8e8c6d09b Merge remote-tracking branch 'upstream/release-0.1' into release-0.1 2012-03-04 12:19:08 +01:00
Alexander Eckart 848f5b62aa new splash screen logo file (with transparency), new splash screen drawing method 2012-03-04 01:21:02 +01:00
Florian Kuepper cd4a4c5878 Fix some typos || thanks bohning :) 2012-03-03 23:43:44 +01:00
Florian Kuepper c94d296462 Merge remote-tracking branch 'voc/release-0.1' into release-0.1 2012-03-03 23:16:34 +01:00
Florian Kuepper 289399c62e Added pantero and Pinky007 to credits. 2012-03-03 23:15:28 +01:00
Alexander Eckart c377a583da fixed typo 2012-03-03 23:08:29 +01:00
Alexander Eckart 05fa8a74ce moved Readme to Output folder, deleted main readme (it must be rewritten) 2012-03-03 22:46:19 +01:00
Florian Kuepper 51c00ed64f Added fading for names. 2012-03-03 22:19:39 +01:00