Projects/Vocaluxe
2
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
856 Commits 7 Branches 7 Tags
a3c050578d1c94de2ade2fc5ffcafc27b6c3a95c
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Kuepper a3c050578d Update to playlist-conversion. 2012-12-22 00:07:51 +01:00
Florian Kuepper 503037f10b Added conversion of usdx-playlists. Just copy *.upl files to playlist-folder. *.upl-Files will be removed after conversion! 2012-12-21 21:43:18 +01:00
Florian Kuepper 7f4a657aa4 Merge branch 'develop' of github.com:Vocaluxe/Vocaluxe into develop 2012-12-21 18:01:46 +01:00
Florian Kuepper f888c3ae53 Show particle-effect instead of italic-text on new entry. Fixed new entry for more than one player. 2012-12-21 18:01:07 +01:00
Florian Kuepper ea5774eff3 Could load particle-effects from theme now. 2012-12-21 17:16:09 +01:00
Florian Kuepper 8e51252284 Merge branch 'develop' of github.com:Vocaluxe/Vocaluxe into develop 2012-12-21 15:04:53 +01:00
Florian Kuepper 77f21e8dc8 Undo last changes. 2012-12-21 12:54:40 +01:00
Florian Kuepper 27449a75d0 Fix highscore-adding. 2012-12-21 12:34:14 +01:00
Florian Kuepper 327087bfe6 Fix jump-style of lyrics. 2012-12-20 17:00:23 +01:00
Florian Kuepper 6186a72410 some changes for db-update. 2012-12-17 22:23:44 +01:00
Florian Kuepper 1c00f0eb44 Style-work on highscore-screen. 2012-12-17 22:07:13 +01:00
Florian Kuepper a44e8d9927 Fixed mysql-bug. 2012-12-17 21:51:31 +01:00
Florian Kuepper c0c1934747 Added ShortSong to HighscoreDB. Increase HighscoreDB-Version. 2012-12-17 21:46:15 +01:00
Florian Kuepper 431d7d2bb2 First fix for highscore-screen. 2012-12-17 20:58:53 +01:00
Florian Kuepper 22c59479ad Merge branch 'challenge' of github.com:Vocaluxe/Vocaluxe into challenge 2012-12-17 19:01:23 +01:00
Florian Kuepper 39ef7b1d2d Merge branch 'challenge' of github.com:Vocaluxe/Vocaluxe into challenge 2012-12-17 18:54:57 +01:00
Florian Kuepper 291021b136 Added texts for player-names to song-screen in party-mode. 2012-12-17 18:54:42 +01:00
Florian Kuepper bcf5fb17bd Added start-button to song-screen in party-mode. 2012-12-17 18:23:27 +01:00
Florian Kuepper 5292c2f47b Merge branch 'challenge' of github.com:Vocaluxe/Vocaluxe into challenge 2012-12-17 18:05:54 +01:00
Florian Kuepper f3dd077113 Added joker-buttons. 2012-12-17 18:04:39 +01:00
Florian Kuepper 2cf45ac25a Return to old max-mic-number. 2012-12-16 20:02:55 +01:00
Florian Kuepper bcbda3aa9e Update challenge-config: Update mic-num automaticly 2012-12-16 20:01:40 +01:00
Florian Kuepper c5209f5264 Added keyboard-handling and remove-function. 2012-12-16 14:31:20 +01:00
Florian Kuepper 9b9de89323 Fix drag'n'drop. 2012-12-16 14:00:42 +01:00
Florian Kuepper b2a763ccbf Could select normal profiles only one time. 2012-12-16 13:51:38 +01:00
Florian Kuepper b4e728f540 Merge branch 'challenge' of github.com:Vocaluxe/Vocaluxe into challenge 
Conflicts:
	Output/PartyModes/Challenge/Code/PartyScreenChallengeConfig.cs
	PartyModeChallenge/PartyScreenChallengeConfig.cs
 2012-12-16 13:14:39 +01:00
Florian Kuepper 96d38b5c35 Fix some bugs. 2012-12-16 13:12:26 +01:00
Florian Kuepper 19c47072cb Merge branch 'challenge' of github.com:Vocaluxe/Vocaluxe into challenge 2012-12-16 12:58:36 +01:00
Florian Kuepper 044b053e20 Draw avatars. 2012-12-16 12:58:24 +01:00
Florian Kuepper 8f1a8fee29 Merge branch 'challenge' of github.com:Vocaluxe/Vocaluxe into challenge 2012-12-16 12:50:17 +01:00
Florian Kuepper 2996c1e1fc Some work on challenge-names. 2012-12-16 12:50:05 +01:00
Florian Kuepper af8d9120ca Merge branch 'challenge' of github.com:Vocaluxe/Vocaluxe into challenge 2012-12-16 12:17:16 +01:00
Florian Kuepper cd7c11ce38 Change challenge-names-screen (first step) 2012-12-16 12:09:40 +01:00
Florian Kuepper 82d1eb8ff3 Added some stuff to challenge-names. Still a lot to do (fix NameSelection-Element for party-mode!) 2012-12-16 11:24:55 +01:00
Florian Kuepper cd74ff602e Work on challenge-names. Problem: Screen loads only 6 player-buttons. 2012-12-15 23:59:50 +01:00
Florian Kuepper def7be77e3 Merge branch 'challenge' of github.com:Vocaluxe/Vocaluxe into challenge 2012-12-15 22:51:14 +01:00
Florian Kuepper cbed73a568 Added slides to challenge-config. 2012-12-15 22:50:31 +01:00
Florian Kuepper 60ae51ff90 Merge branch 'challenge' of github.com:Vocaluxe/Vocaluxe into challenge 
Conflicts:
	Output/PartyModes/Challenge/Screens/PartyScreenChallengeNames.xml
 2012-12-15 22:26:34 +01:00
Florian Kuepper c50d12a4ec Further theme-changes. 2012-12-15 22:23:54 +01:00
Florian Kuepper caa3fd763a Theme-changes for challenge-config. 2012-12-15 20:31:00 +01:00
Florian Kuepper 90cd31cbbf Fix wrong string. 2012-12-15 20:07:11 +01:00
Florian Kuepper 6e24307844 Fix wrong variables. 2012-12-15 20:04:58 +01:00
Florian Kuepper 0e33a7c6bc Merge branch 'challenge' of github.com:Vocaluxe/Vocaluxe into challenge 2012-12-15 20:02:07 +01:00
Florian Kuepper 3d072d7477 Added targetaudience, number of players/teams to party-screen. 2012-12-15 20:01:48 +01:00
Florian Kuepper 06d0a636d9 Merge branch 'challenge' of github.com:Vocaluxe/Vocaluxe into challenge 2012-12-15 19:35:27 +01:00
Florian Kuepper a2c9b0af07 Merge branch 'challenge' of github.com:Vocaluxe/Vocaluxe into challenge 2012-12-15 19:30:13 +01:00
Florian Kuepper ee5cf21da6 Merge branch 'challenge' of github.com:Vocaluxe/Vocaluxe into challenge 2012-12-15 19:14:27 +01:00
Florian Kuepper 26ff9c393d Show error-msg when party-mode can't be loaded. 2012-12-15 19:14:14 +01:00
Florian Kuepper 297116beb8 Added more information of party-mode to screen. 2012-12-15 19:03:11 +01:00
Florian Kuepper fdceea0bdf Revert. 2012-12-15 14:04:35 +01:00
Florian Kuepper c13590e7d2 Merge branch 'develop' of github.com:flokuep/Vocaluxe into develop 2012-12-15 14:03:55 +01:00
Florian Kuepper 225d9326ea Revert last changes and do this in a better way. 2012-12-15 14:03:19 +01:00
Florian Kuepper 94753c62a1 Set duet-parts correctly when singing all (visible) songs. 2012-12-15 13:48:10 +01:00
Florian Kuepper 3e319ca3ef Don't show popup after singing started with ld. 2012-12-15 13:38:22 +01:00
Florian Kuepper 1e2c58fd24 Merge branch 'develop' of github.com:Vocaluxe/Vocaluxe into develop 
Conflicts:
	Vocaluxe/Menu/SongMenu/CSongMenuTileBoard.cs
 2012-12-09 13:01:40 +01:00
Florian Kuepper 99ce2ca60f Fix drawing of vid-texture with reflection in song-menu. 2012-12-09 10:24:50 +01:00
Florian Kuepper 7df617cde9 Fix for playlist-element. 2012-12-09 10:12:45 +01:00
Florian Kuepper baac17033b Some bugfixes for playlists. 2012-12-08 23:53:15 +01:00
Florian Kuepper 867016d5f4 Fix for last commit. 2012-12-08 23:03:40 +01:00
Florian Kuepper 5a363ed17e Fixed bug with playlist-mouse-handling. 2012-12-08 22:55:59 +01:00
Florian Kuepper 968fc04c5a Fixed bug with playlist-mouse-handling. 2012-12-08 22:38:43 +01:00
Florian Kuepper 2235f85896 Fix bug on song-screen after theme-change. 2012-12-08 22:30:40 +01:00
Florian Kuepper 5ee5833a89 Fixed typo. 2012-12-08 19:30:22 +01:00
Florian Kuepper eead8b6c8f Fix for TextRelativeX in SelectSlide. 2012-12-08 17:32:15 +01:00
Florian Kuepper 9db2d63026 Fix for profiles-screen. 2012-12-08 16:57:16 +01:00
Florian Kuepper 088343203f Update theme-changelogs. 2012-12-08 16:57:05 +01:00
Florian Kuepper efd182544f Update screen-version. 2012-12-08 16:26:22 +01:00
Florian Kuepper d6d29d5334 Fix for profile-screen. 2012-12-08 15:08:02 +01:00
Florian Kuepper f005ba1376 Fix for debug-drawing. 2012-12-08 14:30:26 +01:00
Florian Kuepper 7bf41a2092 Theme-fixes on ScreenOptionsVideo. 2012-12-08 14:26:52 +01:00
Florian Kuepper fca537eafa Scroll music-volume with mouse-wheel when popup is active. 2012-12-07 23:43:32 +01:00
Florian Kuepper 457b21c7df Added missing files. 2012-12-07 23:32:15 +01:00
Florian Kuepper 5b4133d5f3 Don't show volume-popup if cursor is hidden. 2012-12-07 23:21:17 +01:00
Florian Kuepper ace002a7b1 Show popup for 1.5 sec if volume changed by keyboard. 2012-12-07 23:09:22 +01:00
Florian Kuepper 4eb22ddfbe Some fixes for volume-settings. 2012-12-07 22:49:19 +01:00
Florian Kuepper 3b759b608e Fix for sound-options. 2012-12-07 22:42:37 +01:00
Florian Kuepper a7f4c1ab10 Remove unneeded function. 2012-12-07 22:33:50 +01:00
Florian Kuepper 556e8d541b Remove unneeded skin. 2012-12-07 21:49:31 +01:00
Florian Kuepper 256762305a Finished volume-control. 2012-12-07 21:45:17 +01:00
Florian Kuepper 2b943305a1 Merge remote-tracking branch 'remotes/upstream/develop' into develop 2012-12-07 19:57:03 +01:00
Florian Kuepper 4905d6bfd8 First step for individual volumes. 2012-12-07 19:56:53 +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
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
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
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
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
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
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