 Alexander Eckart
|
fe52c326bb
|
fixed StartButton bug in SongScreen
|
2012-12-17 19:35:21 +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 |
|
|
Alexander Eckart
|
e1ee9504b7
|
Merge branch 'challenge' of git://github.com/flokuep/Vocaluxe into challenge
|
2012-12-17 15:49:48 +01:00 |
|
|
Alexander Eckart
|
7ae85dcfe3
|
added nCk calculation, don't know the limit...
|
2012-12-17 15:48:55 +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
|
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 |
|
|
Alexander Eckart
|
507eedd9d9
|
fixed button texture drawing after copying
|
2012-12-16 12:57:27 +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 |
|
|
Alexander Eckart
|
3df90af973
|
added texture modification to buttons
|
2012-12-16 12:48:55 +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 |
|
|
Alexander Eckart
|
ce8b56d7aa
|
added button cloning
|
2012-12-16 12:07:35 +01:00 |
|
|
Alexander Eckart
|
becc1c6ee6
|
allow access to Base in CMenu.cs
|
2012-12-16 11:48:35 +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 |
|
|
Alexander Eckart
|
c2198da218
|
fixed fading of party screens
|
2012-12-15 22:49:13 +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 |
|
|
Alexander Eckart
|
7151d1ccdf
|
Merge pull request #58 from flokuep/challenge
merge flokuep/Vocaluxe/challenge into challenge
|
2012-12-15 11:21:15 -08: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 |
|