Commit Graph
231 Commits
Author SHA1 Message Date
Alexander Eckart f22dd4295a Merge branch 'develop' into challenge 2012-12-21 14:51:48 +01:00
Alexander Eckart edef3a8855 readme update 2012-12-21 12:03:39 +01:00
Alexander Eckart 4df81ab61f compiled hidapi.dll with visual studio 2008 2012-12-21 11:43:25 +01:00
Alexander Eckart b7b6678d2d readme update, roadmap update 2012-12-20 21:28:54 +01:00
Alexander Eckart abc00ebd4a added stats table to challenge main screen. there is a problem with guest profiles. 2012-12-18 23:50:05 +01:00
Alexander Eckart 188a9b9332 removed duplicate code files 2012-12-17 20:39:57 +01:00
Alexander Eckart 4622bfcc97 limit max mic at once to 6 2012-12-17 20:38:21 +01:00
Alexander Eckart 2dfbecdb20 added drawing team names, fixed joker handling 2012-12-17 20:35:28 +01:00
Alexander Eckart b92169ff33 added set joker method 2012-12-17 19:36:07 +01:00
Alexander Eckart 94184fc78a Merge branch 'challenge' of git://github.com/flokuep/Vocaluxe into challenge 2012-12-17 19:25:18 +01:00
Alexander Eckart bad4b3a5aa some data handling between challenge main screen and challenge game mode 2012-12-17 19:24:33 +01:00
Alexander Eckart 99875f4293 added "Next Round" button to challenge main screen 2012-12-17 19:06:59 +01:00
Florian Kuepper 22c59479ad Merge branch 'challenge' of github.com:Vocaluxe/Vocaluxe into challenge 2012-12-17 19:01:23 +01:00
Alexander Eckart d136621e8e finished challenge mode name selection screen 2012-12-17 19:00:04 +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
Alexander Eckart 71f24fb38a changed name selection behavior 2012-12-17 18:37:30 +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
Alexander Eckart cae4e441e1 finished challenge config screen 2012-12-17 17:44:51 +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
Alexander Eckart 88630e5161 config screen receives now some data from game mode 2012-12-16 14:50:18 +01:00
Alexander Eckart 9e9383d5ad Merge remote-tracking branch 'remotes/flokuep/challenge' into challenge 2012-12-16 14:35:53 +01:00
Alexander Eckart 1fe8f76bda some preparations for challenge mode 2012-12-16 14:34:17 +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
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