Commit Graph
100 Commits
Author SHA1 Message Date
Florian Küpper 170f7d2d3e Reset border adjustments with STRG + ALT + SHIFT + 0 2013-12-26 13:06:26 +01:00
Florian Küpper 8de95ffee0 Just a comment-fix 2013-12-26 13:06:24 +01:00
Florian Küpper dde4ef951c Added DEBUG_HIT option again. 2013-12-26 13:06:21 +01:00
Florian Küpper f745298fcb Fix name-selection and guest-profiles. 2013-12-26 13:04:38 +01:00
Florian Küpper f5dffdf178 Disable resetting after pause, isn't ready yet. 2013-12-26 13:03:26 +01:00
Florian Küpper d24c47012c Revert "Revert PartyNames-changes on develop-branch."
This reverts commit 43545ac47f.

Conflicts:
	VocaluxeLib/Menu/CNameSelection.cs
2013-12-26 13:02:06 +01:00
Florian Küpper 2f01f4db15 Fixes #87 - Crash without songs. 2013-12-26 13:02:01 +01:00
Florian Küpper 5449d985ef Revert PartyNames-changes on develop-branch. 2013-12-26 13:02:00 +01:00
Florian Küpper aa481bb3f8 PlayerNames: Change player/team-num on NamesScreen. TODO: Theme-stuff and remove options from config screen. 2013-12-26 13:02:00 +01:00
Florian Küpper bdf28a5daf PartyNames: Added visual feedback for max-player-num. 2013-12-26 13:01:59 +01:00
Florian Küpper 651f38cbbe PartyNames: Some theme-adjustments. 2013-12-26 13:01:59 +01:00
Florian Küpper dfeb19c140 PartyNames: Added support for no teams. 2013-12-26 13:01:58 +01:00
Florian Küpper 14f5c12d9e Added draft for NameSelection in party-modes. Just extend CMenuPartyNameSelection in a screen.
Developer could use it or not, using it would make creating party-modes much easier.
More additions to this screen will come.
2013-12-26 13:01:58 +01:00
Florian Küpper 830a2a8c9c Some additions to select-slides. 2013-12-26 13:01:57 +01:00
Florian Küpper 12f4a499ab #BACKGROUND-Tag could be multiple now, when there are more than one bgs, a slide-show will shown in ScreenSing. 2013-12-26 13:01:48 +01:00
Florian Küpper fe6b7ef8c8 Added new background-option: SlideShow. 2013-12-26 12:58:44 +01:00
Florian Küpper 0c807862a8 Patch WebserverFlokuepDevelopTest 2013-12-19 09:02:40 +01:00
Florian Küpper 42b82f5b29 Added server-address as text to Server-Popup. 2013-12-19 08:57:41 +01:00
Florian Küpper 6f5a36e23c Remove debug-stuff. 2013-12-19 08:54:31 +01:00
Florian Küpper 88a8d594ea Fixed flickering of bg-slideshow. 2013-12-19 08:54:30 +01:00
Florian Küpper 21ff3962ec Fixed round-images on ScreenScore. 2013-12-19 08:54:28 +01:00
Florian Küpper 352b0181fa Changed GuestProfile-option on profiles to UserRole. UserRole could now be set from Vocaluxe. 2013-12-19 08:54:27 +01:00
Florian Küpper d9a2ea8ce0 Testing adding round-pictures to ScreenScore. 2013-12-19 08:54:25 +01:00
Florian Küpper a38ae0d699 Added missing language entries. 2013-12-19 08:54:23 +01:00
Florian Küpper 7b62645159 Added button to game-options to open qr-screen. 2013-12-19 08:54:22 +01:00
Florian Küpper ae0e63d193 Added Popup with QR-Codes for easier server-connection and app-download (open with F11) 2013-12-19 08:54:20 +01:00
Florian Küpper 524d0bee75 Make random a bit less random, but already sung songs shouldn't be suggested frequently. 2013-12-19 08:50:46 +01:00
Florian Küpper 2d4cedbf8a Rename a variable. 2013-12-19 08:50:45 +01:00
Florian Küpper 42ddb94072 #BACKGROUND-Tag could be multiple now, when there are more than one bgs, a slide-show will shown in ScreenSing. 2013-12-19 08:50:45 +01:00
Florian Küpper 350ad4d3f6 Added new background-option: SlideShow. 2013-12-19 08:50:45 +01:00
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