Commit Graph
100 Commits
Author SHA1 Message Date
Florian Küpper c57da72d23 Merge branch 'develop' of github.com:Vocaluxe/Vocaluxe into tic-tac-toe 2012-12-31 13:15:44 +01:00
Florian Küpper e856fafb96 Added keyboard-navigation. 2012-12-31 13:15:05 +01:00
Florian Küpper 7a3ba952e9 More random to rounds-building. 2012-12-31 12:18:58 +01:00
Florian Küpper 95b4bb59c4 Language-update. 2012-12-31 12:04:44 +01:00
Florian Küpper f610a708e5 Added some more config-options: Song-Source (All songs, category (Show tabs must be "on" in game-options!), playlist) and Game-Mode (normal, duet, short-song) 2012-12-31 11:49:05 +01:00
Florian Küpper f58064d174 Some bugfixes. 2012-12-31 10:17:56 +01:00
Florian Küpper 3155812900 Fixed name-selection, deactivated drag & drop. 2012-12-31 10:02:36 +01:00
Florian Küpper 3892ee7f30 Some theme-improvements. 2012-12-31 09:25:50 +01:00
Florian Küpper e4c7142a28 Remove some debug-stuff. 2012-12-31 09:09:53 +01:00
Florian Küpper 765323f93e Merge branch 'develop' of github.com:Vocaluxe/Vocaluxe into tic-tac-toe
Conflicts:
	Vocaluxe.sln
2012-12-31 00:29:31 +01:00
Florian Küpper edeb2702f8 Added winner-detection. 2012-12-31 00:20:44 +01:00
Florian Küpper 08b592f730 Added functions to joker-buttons. 2012-12-30 19:31:25 +01:00
Florian Küpper 6308e0fc17 Merge remote-tracking branch 'remotes/Upstream/develop' into tic-tac-toe
Conflicts:
	Vocaluxe.sln
2012-12-30 18:46:45 +01:00
Florian Küpper f21c7f2478 Added tic-tac-toe-party-mode. Still something to do (joker, lang, winning) 2012-12-30 18:37:07 +01:00
Florian Küpper eaae3173d5 Added option to draw score-animation vertical. 2012-12-28 15:17:32 +01:00
Florian Küpper 907ec1f1cb Added some screen-settings to ScreenScore. 2012-12-28 14:03:44 +01:00
Florian Küpper 3eda104c81 Added ScreenSetting as new Theme-Element. 2012-12-28 13:29:28 +01:00
Florian Küpper 00aead7490 Fixed linebreaks in duet. 2012-12-26 14:26:51 +01:00
Florian Küpper 2cb43ae753 Fix search. 2012-12-25 22:34:55 +01:00
Florian Kuepper 9907c56909 Fix visibility of skip-button in pause-menu. 2012-09-08 15:35:34 +02:00
Florian Kuepper 11f58a1ca4 Fix switching through songs on highscore-screen. Use Left/Right or MiddleButton. 2012-09-08 15:06:34 +02:00
Florian Kuepper fa26226701 Scroll through scores on ScoreScreen with MouseWheel. 2012-09-08 12:46:11 +02:00
Florian Kuepper d3159b9c83 Save last game-mode selection. 2012-09-08 12:37:37 +02:00
Florian Kuepper d3f0fbac0a Use selected game-mode for new song in playlist. 2012-09-08 12:23:43 +02:00
Florian Kuepper 56c0698183 Added possibility to change playlist-name. 2012-09-08 12:13:05 +02:00
Florian Kuepper b7d14f5516 Fix bug of overlapping texts and statics in playlist-element. 2012-09-07 14:34:12 +02:00
Florian Kuepper 94b4fd462b Equalizers are "nulled" now. 2012-08-11 15:51:09 +02:00
Florian Kuepper adb8ee7478 Toggle between duet-part with F10 after selecting player with [1...6] 2012-08-11 15:20:21 +02:00
Florian Kuepper 5abd428462 Equalizer-Interaction is ThemeEditorOnly now. 2012-08-11 14:50:42 +02:00
Florian Kuepper 6f9f90bea7 Some clean-up for equalizer. 2012-08-11 14:27:09 +02:00
Florian Kuepper c9fb10a20b Remove some unused statics. 2012-08-04 20:12:38 +02:00
Florian Kuepper 1ff2182df6 Fix error with reading duet-tags. 2012-08-04 15:55:49 +02:00
Florian Kuepper 34356f351a Show duet-names on sing-screen for better orientation. 2012-08-04 15:33:33 +02:00
Florian Kuepper a97baab903 Fix fading-bug with duets. 2012-08-04 14:20:24 +02:00
Florian Kuepper 01495362e9 Update Changelog for ScreenNames. 2012-08-04 14:19:51 +02:00
Florian Kuepper 9fda9eb06e Added possibility to choose duet-part on Name-Selection. Added new tags: #P1 and #P2. 2012-08-04 13:55:57 +02:00
Florian Kuepper 4d6bac2e2b Fix equalizer-positions. 2012-07-28 12:58:49 +02:00
Florian Kuepper f6cbc2687b Start (un)endless name-selection with "P". "P" for next player, "enter" for select profile, "escape" for stop selecting. 2012-07-27 18:20:58 +02:00
Florian Kuepper 1cca599a74 Equalizers could only used, when they are handled by screen. Later we will give possibility to add "normal" equalizers which shows bg-music. 2012-07-27 17:50:50 +02:00
Florian Kuepper c40f07c2a1 Fix DrawColorReflection (thx Darkice) 2012-07-27 17:44:22 +02:00
Florian Kuepper df8f2c10d2 Added equalizers to ScreenNames to show mic-input. Should be useful with more than 2 mics... 2012-07-27 14:14:47 +02:00
Florian Kuepper aacc842d80 Increase screen-version of ScreenOptionsRecord. 2012-07-27 12:25:40 +02:00
Florian Kuepper 2484c52e08 Move Equalizer-Element to Screen-Files. Still some work left. 2012-07-27 12:21:39 +02:00
Florian Kuepper 65b76df0f7 Added DrawColorReflection-Method. Buggy with OpenGL - Need some help! 2012-07-27 12:17:00 +02:00
Florian Kuepper 4c07e89904 Fix wrong assignment of keys. 2012-07-20 12:10:32 +02:00
Florian Kuepper ebef44745a Added SText to buttons. 2012-07-20 11:52:38 +02:00
Florian Kuepper 6aaa308e39 Fix scrolling. 2012-07-13 14:14:26 +02:00
Florian Kuepper 53ab3fd667 Added overall score to ScreenScore. 2012-07-12 16:03:09 +02:00
Florian Kuepper bc9d1882cf Added skip-function. Press CTRL + S or go to pause-menu. 2012-07-12 15:08:32 +02:00
Florian Kuepper 435a205f57 Really fixed song-bug. Thx brunzel! 2012-07-11 21:08:12 +02:00
Florian Kuepper 5062eb4b16 Fixed song-bug. Thx Darkice. 2012-07-11 20:00:47 +02:00
Florian Kuepper dbb5157420 Try to fix song-bug (don't work yet) 2012-07-11 19:46:23 +02:00
Florian Kuepper d41fd50597 Fix loading of playlist. 2012-07-11 14:29:21 +02:00
Florian Kuepper 9ddff4d567 Move Playlist-related elements (buttons, texts, statics) to playlist-element. 2012-07-11 14:17:34 +02:00
Florian Kuepper f40d250dc3 Changing of selectslide-values changes now game-mode. 2012-07-11 13:30:10 +02:00
Florian Kuepper f31dd0903f First fix for keyboard-handling. 2012-07-11 13:18:44 +02:00
Florian Kuepper b007c79d22 More input-handling. Keyboard doesn't work atm. 2012-07-11 12:52:44 +02:00
Florian Kuepper 9b1e2b8580 First part of fixing SelectSlide for Playlist. 2012-07-10 17:48:01 +02:00
Florian Kuepper ad66fdb07b Forget to add new color-sheme. 2012-07-10 17:06:40 +02:00
Florian Kuepper 9a3e265370 First keyboard-handling. Still buggy. 2012-07-09 11:09:05 +02:00
Florian Kuepper 2d400469cf Added first mouse-handling. RB to delete PlaylistEntry. 2012-07-08 21:38:37 +02:00
Florian Kuepper ba04c6babb Forget to upload file. 2012-07-08 14:11:09 +02:00
Florian Kuepper 74f24125da Added first (playable) Playlist-Element to ScreenSong. Still a lot to do! 2012-07-08 14:09:05 +02:00
Florian Kuepper 5e87b79ed4 Merge remote-tracking branch 'upstream/develop' into medley 2012-07-06 10:40:26 +02:00
Florian Kuepper 889dacc32e Merge remote-tracking branch 'upstream/develop' into develop 2012-07-06 10:32:48 +02:00
Florian Kuepper daf1848e45 Fix problem of spaces between P and number in duet-files. 2012-07-03 11:16:43 +02:00
Florian Kuepper e6556e54ee Changed playlist. 2012-06-19 18:12:25 +02:00
Florian Kuepper 6202c67156 Added first basic playlist-format. 2012-06-18 17:28:21 +02:00
Florian Kuepper 8ef112f6b6 Could sing a medley or short-song now. 2012-06-17 18:00:29 +02:00
Florian Kuepper 5f00a432e1 Merge remote-tracking branch 'upstream/develop' into medley 2012-06-17 17:52:24 +02:00
Florian Kuepper d3cb14d51a Added switch to small view (not ready yet) 2012-06-17 16:34:30 +02:00
Florian Kuepper ae2c693e37 Merge remote-tracking branch 'upstream/develop' into medley 2012-06-17 15:10:32 +02:00
Florian Kuepper 6d07fefffc Forget to update CScreenHighscore.cs 2012-06-17 13:47:05 +02:00
Florian Kuepper 3616774bb2 Merge remote-tracking branch 'upstream/develop' into medley 2012-06-17 13:37:48 +02:00
Florian Kuepper a4f253bf67 Added short-song-game-mode. Game-Mode-Names are now translated. 2012-06-17 13:37:18 +02:00
Florian Kuepper 992397d498 Added song-options on ScreenSong. Need fix for drawing... 2012-06-17 11:29:31 +02:00
Florian Kuepper 07bad380a3 Merge remote-tracking branch 'upstream/develop' into medley 2012-06-16 17:20:14 +02:00
Florian Kuepper d6557de01c Added lyrics-options to new screen.
TODO: Update languages (spanish + frensh)
2012-06-16 17:17:45 +02:00
Florian Kuepper 04703c4720 Merge remote-tracking branch 'upstream/develop' into develop 2012-06-16 16:29:38 +02:00
Florian Kuepper 114dbe6965 Reload (hopefully) all colors now on skin-change. 2012-06-12 18:22:08 +02:00
Florian Kuepper 37cef42151 some theme-fixes & change colors of skins (yellow skin is really yellow now and so on...) 2012-06-12 18:21:07 +02:00
Florian Kuepper 33bc3903e9 Merge remote-tracking branch 'upstream/develop' into develop 2012-06-12 15:27:27 +02:00
Florian Kuepper 8d6f46b93e Nicer lyrics-animation for "jump". 2012-06-02 15:10:58 +02:00
Florian Kuepper 792b27d5d3 Some theme-updates. 2012-06-02 14:07:58 +02:00
Florian Kuepper c9014fbc23 Fix bug on selecting profiles with keyboard. 2012-06-02 13:48:49 +02:00
Florian Kuepper 111194f272 Fix adding german umlaute to categories. 2012-06-02 12:48:33 +02:00
Florian Kuepper efb16a9885 Delete IgnoreArticles()-Method. 2012-06-02 11:51:24 +02:00
Florian Kuepper 249b91d327 Changed ignore-articles function to tag-based. 2012-06-02 11:50:20 +02:00
Florian Kuepper 6c70c52a1f Added option to config.xml to ignore articles of title and artist on sorting. Do we need a entry on options screen? 2012-05-30 14:47:14 +02:00
Florian Kuepper 5f6ab8f3db Bigger names on Name-Selection-Screen. 2012-05-19 17:24:19 +02:00
Florian Kuepper 6ad006b3bd Merge remote-tracking branch 'upstream/develop' into 6-player 2012-05-19 17:02:18 +02:00
Florian Kuepper e26536c31d Fix player-selector. Thx brunzel! 2012-05-06 18:23:42 +02:00
Florian Kuepper 40db11f9e0 Fix little theme-bug. 2012-05-06 18:01:31 +02:00
Florian Kuepper 0733b8be99 Added player-selector for keyboard selection of profiles. Doesn't work yet. 2012-05-06 15:59:05 +02:00
Florian Kuepper b2c7b4c7cb Merge remote-tracking branch 'upstream/develop' into 6-player 2012-05-06 15:56:38 +02:00
Florian Kuepper 3edf3b47d2 Fix number of without-profile-players. 2012-05-05 13:11:38 +02:00
Florian Kuepper f6b3733c9c Show bg-music-popup also on names-screen. Why was it deactivated? 2012-05-05 12:10:48 +02:00
Florian Kuepper b49b7097af Merge remote-tracking branch 'upstream/develop' into 6-player 2012-05-05 11:49:24 +02:00
Florian Kuepper 3901a95cd3 Use only active profiles from config.xml. 2012-04-12 11:44:52 +02:00
Florian Kuepper ddee8f5fae Change behavior on ScreenNames: Only show active profiles, you could select every profile only one time, except guest-profiles. 2012-04-12 11:42:48 +02:00