Projects/Vocaluxe
2
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
775 Commits 7 Branches 7 Tags
b4e728f5406b6c72fe3c21d3dad4aac78a33f1c2
Commit Graph
202 Commits
Author SHA1 Message Date
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
Alexander Eckart 10bcf64731 some additions to party mode challenge 2012-12-16 13:10:28 +01:00
Florian Kuepper 044b053e20 Draw avatars. 2012-12-16 12:58:24 +01:00
Florian Kuepper 2996c1e1fc Some work on challenge-names. 2012-12-16 12:50:05 +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 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
Alexander Eckart 007ea68a15 added communication methods and structures for party modes 2012-12-15 22:18:20 +01:00
Florian Kuepper caa3fd763a Theme-changes for challenge-config. 2012-12-15 20:31:00 +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
Alexander Eckart 3d5d3f10b7 programmed the more info for party mode fields 2012-12-15 19:59:33 +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
Alexander Eckart 0bb92bbb36 fixed typo 2012-12-15 18:49:24 +01:00
Alexander Eckart 9257e6f134 added partymodeID to all elements, fixed bug in buttons (text was drawn twice) 2012-12-15 18:40:22 +01:00
Alexander Eckart 632206c317 fixed party screen translations 2012-12-15 16:35:48 +01:00
Alexander Eckart 196a881bcc added missing file 2012-12-15 16:11:32 +01:00
Alexander Eckart 67ac028232 added party language files 2012-12-15 16:10:22 +01:00
Alexander Eckart 9ec4c31401 added theme loading for party screens (there is still a lot to do) 2012-12-15 16:09:32 +01:00
Alexander Eckart 41f8f9ce72 added challenge main screen (just testing) 2012-12-15 12:38:48 +01:00
Alexander Eckart fb4c7de142 fixed party mode xml reading, added compiler code, added challenge game mode files (just a first test) 2012-12-14 22:57:00 +01:00
Alexander Eckart 2d0387fb71 added party selection screen 2012-12-10 20:01:41 +01:00
Alexander Eckart 37c0c43823 2. fix III 2012-12-10 19:31:56 +01:00
Alexander Eckart e88378e39f 2. fix I 2012-12-10 19:27:48 +01:00
Alexander Eckart 76f024c3d8 folder fix II: renaming back to Output 2012-12-10 19:22:31 +01:00
Alexander Eckart 1a20af918f folder fix I: renaming to a dummy folder an add the missing files 2012-12-10 19:21:45 +01:00
Alexander Eckart e1b52dfe65 update of french translation (thx to pinky) 2012-12-09 16:41:16 +01:00
Florian Kuepper 5ee5833a89 Fixed typo. 2012-12-08 19:30:22 +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
Stephan Sundermann 009f80e024 Merge remote-tracking branch 'remotes/upstream/develop' into webcam 
Conflicts:
	Output/Languages/Deutsch.xml
	Output/Languages/English.xml
Merged conflicts automatically
 2012-12-08 12:25:59 +01:00
Stephan Sundermann 183cdbb996 Avatars can now be recorded from webcam in profile screen 2012-12-07 23:33:46 +01:00
Florian Kuepper 457b21c7df Added missing files. 2012-12-07 23:32:15 +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
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