820 Commits
Author SHA1 Message Date
Florian Kuepper 4c07e89904 Fix wrong assignment of keys. 2012-07-20 12:10:32 +02:00
Stephan Sundermann 38f52ad505 Added missing assemblies 2012-07-13 14:55:42 +02:00
Florian Kuepper 53ab3fd667 Added overall score to ScreenScore. 2012-07-12 16:03:09 +02:00
Florian Kuepper bc9d1882cf Added skip-function. Press CTRL + S or go to pause-menu. 2012-07-12 15:08:32 +02:00
Florian Kuepper 9ddff4d567 Move Playlist-related elements (buttons, texts, statics) to playlist-element. 2012-07-11 14:17:34 +02:00
Florian Kuepper 9b1e2b8580 First part of fixing SelectSlide for Playlist. 2012-07-10 17:48:01 +02:00
Florian Kuepper ad66fdb07b Forget to add new color-sheme. 2012-07-10 17:06:40 +02:00
Florian Kuepper 74f24125da Added first (playable) Playlist-Element to ScreenSong. Still a lot to do! 2012-07-08 14:09:05 +02:00
Stephan Sundermann ddcf9665cf Updated screenversion
Small theme tweaks
2012-07-06 16:23:31 +02:00
Stephan Sundermann 88bacb3e9c Switched to AForge.NET because OpenCV has no ability to list the devices and is too big (>200mb)
Cameras can now be selected from video options screen, some tweaking is still to be done
Added preview in video options screen
Some tweaks in sing screen
There might be issues with AForge.NET on x86, please test.
2012-07-06 14:12:17 +02:00
Stephan Sundermann b93dd532b4 Added initial webcam support with OpenCV.
Due to OpenCV's size I am not distributing OpenCV binaries in my repository. Download OpenCV and put it in x64 and x86 folder. Emgu CV relies on .Net 3.5, so I had to switch to that framework as well. OpenCV has the big advantage that it will work on Linux too, unlike solutions based on DirectShow. Currently the default device is used for capturing which will be changed in later revisions. We could also use some video filters provided by OpenCV e.g grayscale or canny edges.
2012-07-02 11:45:24 +02:00
Alexander Eckart 74313cf1bd Merge branch 'develop' into medley
Conflicts:
	Output/Themes/Ambient/Skin Blue.xml
	Output/Themes/Ambient/Skin Green.xml
	Output/Themes/Ambient/Skin Red.xml
	Output/Themes/Ambient/Skin Yellow.xml
	Vocaluxe/Screens/CPopupScreenPlayerControl.cs
2012-06-24 21:23:50 +02:00
Alexander Eckart 00998a9fd0 update of ffmpeg (x86), rollback of ffmpeg (x64) to build 0065 2012-06-24 17:36:34 +02:00
Alexander Eckart 195ac8f824 fixed typo 2012-06-21 20:07:08 +02:00
Alexander Eckart 39febd9bc7 added HAlign to texts 2012-06-21 18:01:28 +02:00
Alexander Eckart 36d1f2302e linux support step 1 (first test, no x64 support) 2012-06-19 21:49:54 +02:00
Alexander Eckart b4d155a5a3 compiled Community.CsharpSqlite.dll for target AnyCPU, added source code 2012-06-19 18:29:58 +02:00
Florian Kuepper 6202c67156 Added first basic playlist-format. 2012-06-18 17:28:21 +02:00
Florian Kuepper d3cb14d51a Added switch to small view (not ready yet) 2012-06-17 16:34:30 +02:00
Florian Kuepper 3616774bb2 Merge remote-tracking branch 'upstream/develop' into medley 2012-06-17 13:37:48 +02:00
Florian Kuepper a4f253bf67 Added short-song-game-mode. Game-Mode-Names are now translated. 2012-06-17 13:37:18 +02:00
Florian Kuepper 992397d498 Added song-options on ScreenSong. Need fix for drawing... 2012-06-17 11:29:31 +02:00
Florian Kuepper 07bad380a3 Merge remote-tracking branch 'upstream/develop' into medley 2012-06-16 17:20:14 +02:00
Florian Kuepper d6557de01c Added lyrics-options to new screen.
TODO: Update languages (spanish + frensh)
2012-06-16 17:17:45 +02:00
Florian Kuepper 04703c4720 Merge remote-tracking branch 'upstream/develop' into develop 2012-06-16 16:29:38 +02:00
Alexander Eckart c3394f6c83 update of ffmpeg 2012-06-16 15:28:17 +02:00
Florian Kuepper 37cef42151 some theme-fixes & change colors of skins (yellow skin is really yellow now and so on...) 2012-06-12 18:21:07 +02:00
Florian Kuepper 792b27d5d3 Some theme-updates. 2012-06-02 14:07:58 +02:00
Florian Kuepper 5f6ab8f3db Bigger names on Name-Selection-Screen. 2012-05-19 17:24:19 +02:00
Florian Kuepper 6ad006b3bd Merge remote-tracking branch 'upstream/develop' into 6-player 2012-05-19 17:02:18 +02:00
Alexander Eckart 4d3eed294b ffmpeg update, set thread_count in acinerella to 1 (0 (auto) causes sync problems on HT CPUs), some changes in CVideoDecoderFFmpeg.cs 2012-05-12 14:09:10 +02:00
Florian Kuepper 40db11f9e0 Fix little theme-bug. 2012-05-06 18:01:31 +02:00
Florian Kuepper 0733b8be99 Added player-selector for keyboard selection of profiles. Doesn't work yet. 2012-05-06 15:59:05 +02:00
Florian Kuepper b2c7b4c7cb Merge remote-tracking branch 'upstream/develop' into 6-player 2012-05-06 15:56:38 +02:00
Alexander Eckart 8dbdd7423e update of french language file (by Pinky) 2012-05-06 13:36:48 +02:00
Florian Kuepper b49b7097af Merge remote-tracking branch 'upstream/develop' into 6-player 2012-05-05 11:49:24 +02:00
Florian Kuepper e07f315fdd Forget to upload screen-changelog... 2012-04-10 16:40:30 +02:00
Florian Kuepper 6e59020113 Added option to fade out player-info. 2012-04-10 16:27:43 +02:00
Florian Kuepper c004d68a69 Added playeravatar and -name to SingScreen. Toggle with "I"! 2012-04-10 15:51:31 +02:00
Florian Kuepper f9e516eb7b New design for sing-screen. Thx to jackroke for this idea! 2012-04-10 13:30:38 +02:00
Florian Kuepper 85b16e5f32 Added warning if not all players has a profile... 2012-04-09 14:01:22 +02:00
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