Projects/Vocaluxe
2
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,626 Commits 7 Branches 7 Tags
43be5ff5cfb5886b6686bdec745efcb8d2add521
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Küpper 264e9c77df Fix profiles-bug in names-selection 2013-10-06 16:54:53 +02:00
Florian Küpper 612cc358a3 Rewind after pause (don't work atm) 2013-09-16 20:41:12 +02:00
Florian Küpper 46c12db857 Save points also to notes. 2013-09-15 16:36:53 +02:00
Florian Küpper 808c52d471 Fix merge error. 2013-09-15 15:26:25 +02:00
Florian Küpper 0400a02bc1 Merge branch 'develop' of github.com:Flamefire/Vocaluxe into develop 
Conflicts:
	Vocaluxe/Base/CPlaylists.cs
	Vocaluxe/Base/CProfiles.cs
	Vocaluxe/Base/CSettings.cs
 2013-09-15 15:15:10 +02:00
Florian Küpper 0f0776a99e Merge branch 'release-0.3' of github.com:Vocaluxe/Vocaluxe into develop 2013-09-15 15:06:27 +02:00
Florian Küpper 536ca2868c Fix text-saving. 2013-09-15 13:32:46 +02:00
Florian Küpper 6e3d0ab28f Added new sort-option: Date added. 2013-09-02 12:50:41 +02:00
Florian Küpper 74f7969490 Merge branch 'release-0.3' of github.com:Vocaluxe/Vocaluxe into release-0.3 2013-06-16 18:04:15 +02:00
Florian Küpper 0b89f65ea8 Fixed player-handling in tic-tac-toe. 2013-06-16 15:24:23 +02:00
Florian Küpper e8adefeec5 Fixed typo. 2013-05-27 19:24:59 +02:00
Florian Küpper ac3294099e Fix edit-mode of texts (and a crash on screen-song) 2013-05-26 15:47:32 +02:00
Florian Küpper 7d5babebad Some theme-fixes 2013-05-26 15:25:48 +02:00
Florian Küpper 24fbb13a16 Fixed building of -letter-categories. 2013-05-26 14:54:51 +02:00
Florian Küpper 6bdfb49cbb Fixed double-click-bug on screen-song. 2013-05-26 14:46:01 +02:00
Florian Küpper 81a9486091 Fix sorting ('Ä' was after 'Z') - Is this okay? 2013-05-26 14:22:56 +02:00
Florian Küpper bfc41c7678 Could use num-block for jokers in party-mode. 2013-05-26 14:10:17 +02:00
Florian Küpper 42e1d5c463 Disable jump-to in party-modes. 2013-05-26 14:05:17 +02:00
Florian Küpper 8fabde717f Added second level to jump-to. 2013-05-26 12:49:29 +02:00
Florian Küpper fdef790583 More work on jump-to-function. Should it be active in 0.3? There is still something to do. 2013-05-26 12:07:52 +02:00
Florian Küpper 4ba69da46e Fixed changed-player-bug when using random-joker in tic-tac-toe. 2013-05-23 15:05:47 +02:00
Florian Küpper c2e9fb2aba Fix: config.xml will now be saved after changing timer-option. 2013-05-23 11:07:10 +02:00
Florian Küpper 4473f05487 Avatars on screen-profiles now looks clearer (no alpha) 2013-05-23 11:06:35 +02:00
Florian Küpper 12aec98f2c Fix crash when pressing webcam-button in profiles-screen. 2013-05-23 11:00:35 +02:00
Florian Küpper 2ca07ee777 Fixes for random player-selection on tic-tac-toe-mode. 2013-05-23 10:37:45 +02:00
Florian Küpper f34d8da992 Fixed typo in tic-tac-toe-mode. 2013-05-22 16:34:20 +02:00
Florian Küpper 2740e24830 Fixed crash on tic-tac-toe-mode. 2013-05-22 16:30:24 +02:00
Florian Küpper fcf94a091d Fixed bug with preview-volume on song-screen. 2013-05-22 14:34:28 +02:00
Florian Küpper aa9930b000 Fixed party-mode text-heights. 2013-05-22 14:26:45 +02:00
Florian Küpper 676d195d82 Remove double preview-volume-entry. 2013-05-22 14:17:05 +02:00
Florian Küpper 300163f086 Merge branch 'develop' of github.com:flokuep/Vocaluxe into develop 
Conflicts:
	Vocaluxe/Base/CParty.cs
 2013-05-15 15:57:02 +02:00
Florian Küpper 624ca03db0 Added methods to get party-mode-folder. 2013-05-15 15:55:14 +02:00
Florian Küpper bef0717c15 Added methods to get party-mode-folder. 2013-05-15 15:49:24 +02:00
Florian Küpper 62efcd84d0 Update text-positions (part 2) - Please check if there is still something in main-game looking ugly. 
TODO: Fix party-modes!
 2013-05-13 22:29:48 +02:00
Florian Küpper e2d0054ccf Merge branch 'develop' of github.com:Vocaluxe/Vocaluxe into develop 2013-05-11 16:29:40 +02:00
Florian Küpper 3f46acd06e Merge branch 'develop' of github.com:Vocaluxe/Vocaluxe into develop 2013-05-10 17:25:52 +02:00
Florian Küpper 94e3652db0 Merge branch 'develop' of github.com:Vocaluxe/Vocaluxe into develop 2013-05-07 11:41:08 +02:00
Florian Küpper 2a83c78692 Update positions (part 1) 2013-05-07 11:37:45 +02:00
Florian Küpper 47fce7cbba Update text-heights. 2013-05-04 11:48:19 +02:00
Florian Küpper 76340f7826 Rename HAlign to ResizeAlign 2013-05-04 11:16:41 +02:00
Florian Küpper ff36128326 Added new language-strings. 2013-05-02 11:08:55 +02:00
Florian Küpper 17366b5a36 Merge branch 'develop' of github.com:Vocaluxe/Vocaluxe into develop 2013-05-02 09:42:15 +02:00
Florian Küpper 17cc947a2b Make dynamic lyrics-position more dynamic. 2013-05-01 10:45:02 +02:00
Florian Küpper 0187dd5638 Fixed wrong game-mode on ScreenHighscore. 2013-04-29 11:28:18 +02:00
Florian Küpper 4aa94e188c Added more lyric-position-options. 
TRANSIFEX:
Add: TR_SCREENOLYRICS_POSITION, TR_CONFIG_LYRICSPOSITION_BOTTOM, TR_CONFIG_LYRICSPOSITION_TOP, TR_CONFIG_LYRICSPOSITION_BOTH, TR_CONFIG_LYRICSPOSITION_DYNAMIC
Remove: TR_SCREENOLYRICS_ONTOP
 2013-04-29 09:24:28 +02:00
Florian Küpper 3884632772 Added message for no-mics-error on party-screen. 
Please add "TR_SCREENPARTY_ERROR_MICS" to TRANSIFEX
refs #2
 2013-04-29 08:45:42 +02:00
Florian Küpper 9712771eda Fixed error on loading playlists. 2013-04-29 08:28:15 +02:00
Florian Küpper ed89a91ae5 Merge branch 'develop' of github.com:Flamefire/Vocaluxe into develop 2013-04-29 08:12:03 +02:00
Florian Küpper b213ee5b51 Merge branch 'develop' of github.com:Flamefire/Vocaluxe into develop 2013-04-28 20:08:09 +02:00
Florian Küpper ee91798639 Merge branch 'develop' of github.com:Flamefire/Vocaluxe into develop 2013-04-28 17:47:59 +02:00
Florian Küpper bad6b27245 Fixed webcam-image-aspect on ScreenProfiles. 2013-04-28 10:15:40 +02:00
Florian Küpper 3232a1e989 Reset selected players before activating fast-selection. 2013-04-27 17:50:02 +02:00
Florian Küpper d3c33764a2 Added drag'n'drop for selected profiles for easier switching and unsetting. 2013-04-27 17:03:40 +02:00
Florian Küpper d2516d4ad0 Double click on profile to use it for next free player. 2013-04-27 16:38:22 +02:00
Florian Küpper 98ad7a6be0 Update for fast-player-selection. Press MB or P to start, use mouse or arrow-keys to choose player, select player with LB or Enter. Use [1..6] or MB to skip a player, RB or escape to abort. 
I will think about a easy reset-function...
 2013-04-27 12:28:22 +02:00
Florian Küpper c86f2b2f0a Added Flamefire to credits. 2013-04-25 14:22:55 +02:00
Florian Küpper c44c4de339 Added medley-countdown, ref #3 TODO: Fix ugly big numbers... 2013-04-25 12:46:43 +02:00
Florian Küpper aeaa38cf22 Improved handling of adding new profiles. 2013-04-18 13:22:10 +02:00
Florian Küpper 3a12df643b Improve handling of profile-delete-action. 2013-04-18 13:11:25 +02:00
Florian Küpper 07b61dbe5a Revert "Fix crash without profiles." 
This reverts commit 6b04bc79eb.

Conflicts:
	Vocaluxe/Screens/CScreenNames.cs
	Vocaluxe/Screens/CScreenSing.cs
 2013-04-14 13:14:20 +02:00
Florian Küpper 216e15366c Some minor code changes. 2013-04-08 12:13:06 +02:00
Florian Küpper 0136198313 Fix #14 (short-song-mode). 2013-04-08 12:05:03 +02:00
Florian Küpper dbcc30adb5 Merge branch 'develop' of github.com:Vocaluxe/Vocaluxe into develop 2013-04-08 11:32:07 +02:00
Florian Küpper cc730e4e88 Merge branch 'develop' of github.com:Vocaluxe/Vocaluxe into develop 2013-03-30 13:36:42 +01:00
Florian Küpper 6b04bc79eb Fix crash without profiles. 2013-03-30 12:59:34 +01:00
Florian Küpper fca2254267 Merge branch 'develop' of github.com:Vocaluxe/Vocaluxe into develop 2013-02-27 18:51:20 +01:00
Florian Küpper 9649ba97a1 Merge branch 'develop' of github.com:Vocaluxe/Vocaluxe into develop 2013-02-24 19:13:11 +01:00
Florian Küpper e20bd7093f Added option to config.xml for switching bg-music start-tag behavior. 2013-02-23 14:13:49 +01:00
Florian Küpper 4420a11b08 Fixed video in bg-music with start-tag. 2013-02-23 14:03:57 +01:00
Florian Küpper 08e2f8245b Merge branch 'develop' of github.com:Vocaluxe/Vocaluxe into develop 2013-02-23 13:16:52 +01:00
Florian Küpper 0fa5b69682 Merge branch 'develop' of github.com:Vocaluxe/Vocaluxe into develop 2013-02-23 00:09:50 +01:00
Florian Küpper d227490124 Fix starting bg-music when disabled on start. 2013-02-23 00:07:28 +01:00
Florian Küpper 0d79abcda8 Fix some errors with volume-control, closes #10 2013-02-22 23:56:33 +01:00
Florian Küpper 57c7f6ca2e Fixed bg-music on ScreenSong, #7 2013-02-22 19:06:46 +01:00
Florian Küpper 673ee5b41c Added ProfileFolder as command-line-parameter. 2013-01-22 14:09:08 +01:00
Florian Küpper 148e92a416 Fixed crash on names-screen. 2013-01-11 13:44:05 +01:00
Florian Küpper 34a299bde5 Merge branch 'develop' of github.com:Vocaluxe/Vocaluxe into develop 2013-01-10 18:18:24 +01:00
Florian Küpper 115afef0f1 Fixed volume-control. 2013-01-10 17:48:24 +01:00
Florian Küpper 0ff2bb654f Merge branch 'develop' of github.com:Vocaluxe/Vocaluxe into develop 2013-01-10 17:23:12 +01:00
Florian Küpper 6d78de87f8 Fixed switching of duet-parts. 2013-01-10 17:22:39 +01:00
Florian Küpper ff23a57eef Merge branch 'develop' of github.com:Vocaluxe/Vocaluxe into develop 2013-01-07 17:49:36 +01:00
Florian Küpper 5618dccd01 Don't use RB to remove player-selection on tic-tac-toe-names. 2013-01-07 17:16:11 +01:00
Florian Küpper 1299e6effd Fixed winner-string in challenge-modes. 2013-01-06 18:38:28 +01:00
Florian Küpper b015f2c313 Added SetSelectionToSelectSlide and use this on party-screen. 2013-01-06 16:29:37 +01:00
Florian Küpper 48a6958687 Added some SetInteractionToButton in tic-tac-toe-main. 2013-01-06 16:23:09 +01:00
Florian Küpper 871e5c5d13 Merge branch 'develop' of github.com:Vocaluxe/Vocaluxe into develop 2013-01-06 16:02:39 +01:00
Florian Küpper e82e3b68d6 Added keyboard-handling to scroll-buttons (tic-tac-toe-names) 2013-01-06 15:33:54 +01:00
Florian Küpper 9101483a41 Fixed tic-tac-toe-singing. 2013-01-06 15:31:48 +01:00
Florian Küpper dd68cc5dbf Finished scrolling in tic-tac-toe-names. 2013-01-06 15:25:13 +01:00
Florian Küpper 0b47218bfb Merge branch 'develop' of github.com:Vocaluxe/Vocaluxe into develop 2013-01-06 14:38:36 +01:00
Florian Küpper f90c053b9f Added scrolling to tic-tac-toe-names (Step 1) 2013-01-06 14:37:42 +01:00
Florian Küpper 43737c1d27 Changed mouse-handling in tic-tac-toe-names: Drag & drop to set manually, double click to set automatically, rb or double click on set profile to remove. 2013-01-06 14:27:34 +01:00
Florian Küpper 0257fbefea Fixed auto-assign of duet-parts in screen-names. 2013-01-06 12:45:33 +01:00
Florian Küpper 5246342d6e Fix assign duets. 2013-01-04 16:54:11 +01:00
Florian Küpper 597a838360 Merge branch 'develop' of github.com:Vocaluxe/Vocaluxe into develop 2013-01-04 15:08:27 +01:00
Florian Küpper d33d6359d4 Merge branch 'develop' of github.com:Vocaluxe/Vocaluxe into develop 2013-01-03 17:05:00 +01:00
Florian Küpper b7e1ad2127 Merge branch 'develop' of github.com:Vocaluxe/Vocaluxe into develop 2013-01-03 14:22:50 +01:00
Florian Küpper 2501833d1e Improvement to player-selection. 2013-01-02 22:45:06 +01:00
Florian Küpper d5f225ea67 Changed player-selection in tic-tac-toe. 2013-01-02 16:39:10 +01:00
Florian Küpper f8995c8df8 Disable joker-buttons when they are not available. 2013-01-02 13:22:47 +01:00