Projects/Vocaluxe
2
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,351 Commits 7 Branches 7 Tags
18bdb7aa052d9d53bda75652080911c64e4f3f0e
Commit Graph
458 Commits
Author SHA1 Message Date
Stephan Sundermann 6073d625fb Added buttons for profile snapshots 2012-12-07 21:00:03 +01:00
Stephan Sundermann 463ba9a4b2 Merge remote-tracking branch 'remotes/upstream/develop' into webcam 
Conflicts:
	Vocaluxe/Screens/CScreenSing.cs
Merged CScreenSing.cs manually
 2012-12-07 20:30:17 +01:00
Alexander Eckart a5e1002450 switched ffmpeg libs back to may 2012. the current versions have some unknown problems with acinerella and vocaluxe 2012-12-07 18:14:37 +01:00
Florian Kuepper 9e5e94c013 Added <TextRelativeX> and <TextRelativeY> to SelectSlides. Theme-fix for playlist-element-selectslide. 2012-12-03 22:21:36 +01:00
Alexander Eckart ac2f30450d fixed select slide size and position (playlist), auto saved theme 2012-12-03 18:20:28 +01:00
Florian Kuepper 2f5dae42b6 Update Repeat-Icon. 2012-12-03 09:17:41 +01:00
Florian Kuepper dd427e9c47 Use filename as title for bg-music from bg-music-folder. 2012-12-02 22:44:08 +01:00
Florian Kuepper 1d465f5f2b Fix SelectSlide-Size in playlist. 2012-12-02 20:25:45 +01:00
Florian Kuepper 152b416c1b Merge branch 'medley' into develop 2012-12-02 20:18:05 +01:00
Florian Kuepper 0a53a84b63 Update MedleyIcons. 2012-12-02 17:16:14 +01:00
Florian Kuepper 7973b307ba Merge branch 'develop' of github.com:Vocaluxe/Vocaluxe into develop 2012-12-02 16:38:14 +01:00
Florian Kuepper 5d661b57f5 Update of bg-control-menu-theme. 2012-12-02 16:26:07 +01:00
Florian Kuepper 44b3867eb8 Merge remote-tracking branch 'remotes/upstream/medley' into medley 2012-12-02 15:38:07 +01:00
Alexander Eckart a05aab5f07 Merge branch 'develop' into medley 
Conflicts:
	Vocaluxe/Lib/Song/CSong.cs
 2012-12-02 15:18:35 +01:00
Alexander Eckart 4400855d80 fixed typo 2012-12-02 14:46:54 +01:00
Florian Kuepper 8fa2cb864e Merge branch 'medley' of github.com:Vocaluxe/Vocaluxe into medley 2012-12-02 14:42:34 +01:00
Alexander Eckart 0c1a601968 small adjustment in screen song theme for better keyboard navigation in playlist 2012-12-02 14:32:19 +01:00
Florian Kuepper e1e0e30383 Little theme-fix. 2012-12-02 12:49:11 +01:00
Florian Kuepper 26a5086fc8 Added function to select a random category. 2012-12-01 22:05:45 +01:00
Alexander Eckart 9e355268e0 switched ffmpeg builds to the version from 14.11. - the current build has problems with some mp3s 2012-11-29 19:14:17 +01:00
Alexander Eckart 0437e836dd Merge pull request #41 from Vocaluxe/develop 
merge develop into medley
 2012-11-28 13:30:04 -08:00
Alexander Eckart 023fb1a09a update of ffmpeg 2012-11-28 18:09:54 +01:00
Florian Kuepper 754a4acf57 Update screensong-changelog. 2012-11-01 16:33:00 +01:00
Florian Kuepper 0a1f5e31d5 Added another song-menu for general options: select random, sing all/visible, open playlist. 
Open this menu with space or clicking on song-video.
 2012-11-01 16:30:03 +01:00
Florian Kuepper 5537d78f5d Create playlist-folder if not exists and remove Test.xml. 2012-11-01 14:43:57 +01:00
Florian Kuepper 56c0698183 Added possibility to change playlist-name. 2012-09-08 12:13:05 +02:00
Alexander Eckart 4e42b47b5c fixed theme saving for equalizer, playlist, text and songmenu 2012-08-13 21:51:42 +02:00
Alexander Eckart 6f2fe5f1a7 new interaction handling for playlist (there are still some minor bugs) 2012-08-12 22:55:50 +02:00
Alexander Eckart 25988a645c added missing text translation 2012-08-12 15:09:18 +02:00
Alexander Eckart dcafc3dae5 Merge remote-tracking branch 'remotes/vocaluxe/develop' into medley 
Conflicts:
	Vocaluxe/Lib/Song/CSong.cs
	Vocaluxe/Menu/CInteraction.cs
	Vocaluxe/Menu/CMenu.cs
 2012-08-12 14:37:08 +02:00
Florian Kuepper 6f9f90bea7 Some clean-up for equalizer. 2012-08-11 14:27:09 +02:00
Florian Kuepper c9fb10a20b Remove some unused statics. 2012-08-04 20:12:38 +02:00
Florian Kuepper 34356f351a Show duet-names on sing-screen for better orientation. 2012-08-04 15:33:33 +02:00
Florian Kuepper 01495362e9 Update Changelog for ScreenNames. 2012-08-04 14:19:51 +02:00
Florian Kuepper 9fda9eb06e Added possibility to choose duet-part on Name-Selection. Added new tags: #P1 and #P2. 2012-08-04 13:55:57 +02:00
Florian Kuepper 4d6bac2e2b Fix equalizer-positions. 2012-07-28 12:58:49 +02:00
Florian Kuepper df8f2c10d2 Added equalizers to ScreenNames to show mic-input. Should be useful with more than 2 mics... 2012-07-27 14:14:47 +02:00
Florian Kuepper aacc842d80 Increase screen-version of ScreenOptionsRecord. 2012-07-27 12:25:40 +02:00
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