Projects/Vocaluxe
2
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
636 Commits 7 Branches 7 Tags
463ba9a4b2d44509b21289f481fe77341401ca3e
Commit Graph
636 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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 7be0aa4290 added VolumeMax Value: It is needed to adjust the individual screen volumes. 2012-12-07 19:39: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
Alexander Eckart 95e826d3a8 update to build 0069 2012-12-05 23:14:38 +01:00
Alexander Eckart 9ce6b16aff Merge pull request #47 from flokuep/develop 
Added <TextRelativeX> and <TextRelativeY> to SelectSlides. Theme-fix for...
 2012-12-03 13:37:17 -08:00
Alexander Eckart 1b9e8fbe85 added double click (start song) 2012-12-03 22:29:17 +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 07cf939278 some code cleanup in song screen and some small bugfixes 2012-12-03 21:37:12 +01:00
Alexander Eckart 02e2dabc11 some bugfixes for playlist handling 2012-12-03 20:08:37 +01:00
Alexander Eckart 2248ba65c7 fixed drag&drop for playlist 2012-12-03 19:06:52 +01:00
Alexander Eckart 74f80bde77 changed mouse interaction in song menu 2012-12-03 19:00:10 +01:00
Alexander Eckart ac2f30450d fixed select slide size and position (playlist), auto saved theme 2012-12-03 18:20:28 +01:00
Alexander Eckart d0c6708a6d Merge pull request #46 from flokuep/develop 
Merge pull request #46 from flokuep/develop
 2012-12-03 09:10:08 -08:00
Florian Kuepper 83ccbda816 Merge remote-tracking branch 'remotes/upstream/develop' into develop 
Conflicts:
	Vocaluxe/Screens/CScreenSong.cs
 2012-12-03 09:19:59 +01:00
Florian Kuepper 2f5dae42b6 Update Repeat-Icon. 2012-12-03 09:17:41 +01:00
Florian Kuepper 837ee463b5 Previous-function of bg-music is now similar to other audio-player. Clicking on prev-button during song: Play song from start, Clicking on prev-button during first 1.5 sec, go to prev song. 2012-12-03 09:16:13 +01:00
Florian Kuepper 2340011ba3 BG-Music-Repeat-Function works now as it should. 2012-12-03 08:43:19 +01:00
Florian Kuepper dd427e9c47 Use filename as title for bg-music from bg-music-folder. 2012-12-02 22:44:08 +01:00
Alexander Eckart e2552b83d4 do not interrupt searching 2012-12-02 22:21:30 +01:00
Florian Kuepper c9a2c9404c Merge remote-tracking branch 'remotes/upstream/develop' into develop 2012-12-02 22:15:54 +01:00
Florian Kuepper e6a3281d71 Revert video-full-screen. 2012-12-02 22:15:22 +01:00
Alexander Eckart e762d290cc added drag and drop playlist building, fixed color textures reload for playlists 2012-12-02 21:59:30 +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 b445e322a5 Merge remote-tracking branch 'remotes/upstream/develop' into develop 2012-12-02 20:08:46 +01:00
Alexander Eckart ec39b72f80 added possibility to drop the playlist elements on first and last position even if the mouse is out of range of the other playlist elements 2012-12-02 19:38:18 +01:00
Alexander Eckart 193116f669 added sort by mouse to playlists 2012-12-02 19:21:37 +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
Alexander Eckart 3a3baf6f4c Merge branch 'medley' into develop 2012-12-02 16:29:58 +01:00
Alexander Eckart d89b942f1a scale text glyphs in according to TextureQuality setting 2012-12-02 16:29:20 +01:00
Florian Kuepper 5d661b57f5 Update of bg-control-menu-theme. 2012-12-02 16:26:07 +01:00
Alexander Eckart 38985f2f71 fixed playlist menu handling 2012-12-02 16:04:59 +01:00
Alexander Eckart 93476adc33 roadmap update 2012-12-02 15:51:30 +01:00
Alexander Eckart faab09f355 select current playlist for adding songs 2012-12-02 15:51:17 +01:00
Alexander Eckart 2411b4023b fixed skip song in sing screen (disable pause) 2012-12-02 15:38:39 +01:00
Florian Kuepper 44b3867eb8 Merge remote-tracking branch 'remotes/upstream/medley' into medley 2012-12-02 15:38:07 +01:00
Alexander Eckart d392ca3a30 fixed visibility of lyrics 2012-12-02 15:33:20 +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 80040bcc59 Merge pull request #43 from flokuep/develop 
merge flokuep/Vocaluxe/develop into develop
 2012-12-02 06:04:03 -08:00
Alexander Eckart 9b2630ee5f roadmap update 2012-12-02 15:02:28 +01:00
Alexander Eckart 9d5fdb67de fixed ButtonOpenOptions handling in song screen 2012-12-02 15:02:02 +01:00
Alexander Eckart 9e5b419f80 roadmap update 2012-12-02 14:50:24 +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
Florian Kuepper 23ebc54354 Log error when song is not found from playlist. 2012-12-02 14:34:32 +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
Alexander Eckart 0b0f0caf54 fixed playlist keyboard handling 2012-12-02 14:20:09 +01:00
Florian Kuepper e1e0e30383 Little theme-fix. 2012-12-02 12:49:11 +01:00
Florian Kuepper 2bc0fe8b73 Show duet-names on score-screen if set. 2012-12-02 12:17:11 +01:00