Commit Graph
2931 Commits
Author SHA1 Message Date
Jiiniasu 2dbc84710b Merge remote-tracking branch 'refs/remotes/Vocaluxe/develop' into NamesScroll
# Conflicts:
#	VocaluxeLib/Menu/CNameSelection.cs
2017-11-27 18:55:39 +01:00
Florian Küpper c888b879d0 Merge pull request #339 from flokuep/player-guid
GUID for profiles
2017-11-25 22:55:00 +01:00
Florian Küpper efd3db3e50 Merge branch 'develop' into player-guid 2017-11-25 22:25:55 +01:00
Florian Küpper d28650c699 Merge pull request #340 from lukeIam/dotNet_471
Upgrade all projects to dotNET 4.7.1
2017-11-25 22:25:08 +01:00
lukeIam 2318b518fc Upgraded all projects to dotNET 4.7.1 (closes #315)
(VS2015 needs a developer pack see the issue for detail)
2017-11-25 21:04:24 +01:00
Florian Küpper d140c2311a Merge branch 'develop' of github.com:Vocaluxe/Vocaluxe into player-guid 2017-11-23 16:35:16 +01:00
Florian Küpper 7bf77b66cc Merge branch 'release-0.4.1' of github.com:Vocaluxe/Vocaluxe into develop 2017-11-21 09:54:34 +01:00
Florian Küpper 7dbd2363db Fix: Points were assigned to not sung songs 2017-11-21 09:49:45 +01:00
Florian Küpper fd1eff0867 Added methods for restarting song/game, for #282 2017-11-21 09:37:00 +01:00
Florian Küpper d568e1b01f Merge branch 'develop' of github.com:Vocaluxe/Vocaluxe into develop 2017-11-19 13:40:14 +01:00
Florian Küpper b71437ee83 More dynamically statics and texts loading for pause screen 2017-11-19 13:39:42 +01:00
Florian Küpper 5d735503d3 Merge branch 'release-0.4.1' into develop 2017-11-19 13:33:39 +01:00
Jiiniasu d810aa8ca4 Name Selection Improvements
Fix: Infinite scroll bug with mousewheel
Change: Offset by row instead of page
2017-11-19 12:13:16 +01:00
Florian Küpper 081ca63d85 Merge branch 'release-0.4.1' of github.com:Vocaluxe/Vocaluxe into release-0.4.1 2017-11-16 12:27:31 +01:00
Florian Küpper 06d6be528a Fixed wrong song folder path that leads to not working folder-sorting 2017-11-16 12:26:38 +01:00
Florian Küpper 617362c0d7 Merge branch 'develop' of github.com:Vocaluxe/Vocaluxe into develop 2017-11-16 10:01:14 +01:00
Florian Küpper 9e0f715fce Merge pull request #335 from Jiiniasu/NameSelection-sorted
Sort Profiles by Player Name
2017-11-13 10:56:55 +01:00
Florian Küpper 94dbb90f53 Merge branch 'develop' into NameSelection-sorted 2017-11-13 10:45:58 +01:00
Florian Küpper 7ec591a4dc Merge pull request #336 from Jiiniasu/CScreenNames-Lost-Profiles-Fix
Fix Lost Profile Bug in Player Selection
2017-11-13 10:45:42 +01:00
Jiiniasu 24fc44a1fb Fix Lost Profile Bug in Player Selection
Non-guest profiles assigned to player numbers higher than current amount
of players were left as already selected and thus couldn't be selected
anymore.

Now the player numbers that are higher than the totals will be cleared
and the assigned profiles put back to the pool of profiles to select
from.

New profiles will have to be selected if the player amount is increased.
2017-11-11 15:19:42 +01:00
Jiiniasu 42505e3e95 Sort Profiles by Player Name
Something that resembles natural sorting by player name (for names with
numbers up to 9999) of the profiles.
2017-11-11 14:40:44 +01:00
lukeIam 9b592be4b4 Merge pull request #333 from Jiiniasu/Instant-Preview
Option to autoplay previews
2017-11-10 11:41:48 +01:00
Florian Küpper 15abc916e5 Merge branch 'release-0.4.1' of github.com:Vocaluxe/Vocaluxe into develop 2017-11-09 15:27:22 +01:00
Jiiniasu 2fbb600272 Code move and delay made configurable
Moved code to CSongMenuFramework and made autoplay-delay configurable in
config.xml as suggested in code review.
2017-11-08 21:24:11 +01:00
Jiiniasu dad5f5ec11 Add a delay before playing preview 2017-11-07 20:19:43 +01:00
Jiiniasu 8d50d9f8d1 Clean up code a bit 2017-11-06 20:03:27 +01:00
Jiiniasu ec64a797f5 Add Swedish translation 2017-11-06 19:37:21 +01:00
Jiiniasu c31fdb7839 Make option to autoplay previews on song selection 2017-11-06 19:33:03 +01:00
lukeIam ce4529325b Fix: exception when intro video is missing 2017-11-06 10:08:06 +01:00
Florian Küpper 86dc259c17 Merge branch 'develop' into player-guid 2017-11-05 23:32:30 +01:00
Florian Küpper 073158558e Merge branch 'release-0.4.1' of github.com:Vocaluxe/Vocaluxe into develop 2017-11-05 22:47:52 +01:00
Florian Küpper e04020779a Merge branch 'develop' of github.com:Vocaluxe/Vocaluxe into develop 2017-11-05 22:47:34 +01:00
Florian Küpper f5b83608b0 Merge pull request #246 from Jiiniasu/Multimonitor
Multi-monitor - Initial Support - Work in Progress
2017-11-05 22:19:10 +01:00
Florian Küpper 3f057cd1a6 Merge branch 'develop' into Multimonitor 2017-11-05 17:05:40 +01:00
lukeIam 52f1b8f546 Fix: Vocaluxe crashes when _CopyDecodedFrameToBuffer() fails 2017-11-04 20:13:19 +01:00
lukeIam 79bbcbdccb Try to close the other modules correctly if a single one fails to close ( on program shutdown) 2017-11-04 19:47:47 +01:00
lukeIam a92353c9a2 Try to fix exceptions while closing Vocaluxe (during closing bg video) (may fixes #320) 2017-11-04 19:34:55 +01:00
lukeIam 3e0eec8294 Synchronize access to _PreviewStartHelperTask object (may fixes #330) 2017-11-04 14:58:48 +01:00
Florian Küpper d00891dca7 Merge pull request #329 from pashcovich/patch-1
Fix V3127
2017-10-31 13:44:25 +01:00
Ilya Sosnovsky 7f2d7f576a Fix V3127
Two similar code fragments were found. Perhaps, this is a typo and 'Y' variable should be used instead of 'X' VocaluxeLib CSingNotes.cs 117
2017-10-31 14:39:00 +03:00
Florian Küpper c2b67f1783 Merge branch 'develop' of github.com:flokuep/Vocaluxe into develop 2017-10-30 21:30:45 +01:00
Florian Küpper 009a303c28 Merge branch 'release-0.4.1' into develop 2017-10-30 21:30:24 +01:00
Florian Küpper ceaa77ffe7 Merge pull request #326 from flokuep/0.4.0-fixes
Small fixes
2017-10-30 18:29:06 +01:00
Florian Küpper c87016c4f8 Merge pull request #325 from lukeIam/PACloaseStreamHandling
PortAudio close-stream-handling
2017-10-30 18:28:43 +01:00
Florian Küpper 4d754c0876 Forget to remove a function... 2017-10-08 12:59:46 +02:00
Florian Küpper 8244fd638b Log missing avatar as error instead of throwing exceptions 2017-10-08 12:56:37 +02:00
Florian Küpper 85ad6050f8 Fixed lyrics visibility (closes #322) 2017-10-08 12:56:16 +02:00
Florian Küpper df34766f35 Fixed aspect of avatars 2017-10-08 12:40:59 +02:00
lukeIam ad5ffd7578 Catch potential errors from PortAudio Close() and Dispose() 2017-10-04 14:20:31 +02:00
lukeIam 4784e57370 Refactored mutex use while closing streams in CPortAudioHandle (should fix #320) 2017-10-04 13:12:14 +02:00