Projects/Vocaluxe
2
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,713 Commits 7 Branches 7 Tags
c5104ee219c5826cfcd4e8a1d44818ccf2b04fbc
Commit Graph
298 Commits
Author SHA1 Message Date
Florian Küpper c5104ee219 Merge branch 'develop' of github.com:Vocaluxe/Vocaluxe into PartyNames 
Conflicts:
	VocaluxeLib/Menu/CNameSelection.cs
 2013-12-23 10:51:12 +01:00
Florian Küpper 3721df81e7 Merge branch 'develop' of github.com:Vocaluxe/Vocaluxe into develop 
Conflicts:
	Vocaluxe/Base/CGame.cs
 2013-12-22 23:29:33 +01:00
Florian Küpper 9f6618c77e Added screen for screen-adjustments. 2013-12-22 23:27:52 +01:00
Alexander Eckart 19f635d345 Merge branch 'develop' of https://github.com/Vocaluxe/Vocaluxe into develop 2013-12-22 23:18:38 +01:00
Alexander Eckart 4a7f7a3518 Bugfix: No perfect line flares 2013-12-22 23:18:17 +01:00
Florian Küpper a17e45c818 Merge branch 'develop' of github.com:Vocaluxe/Vocaluxe into develop 2013-12-22 22:29:58 +01:00
Florian Küpper aa4e9ab97c Just a comment-fix 2013-12-22 22:29:35 +01:00
Stephan Sundermann 5bac5e98bf gstreamer-sharp: Query duration async 2013-12-22 22:26:10 +01:00
Stephan Sundermann 7009096b1c Merge branch 'develop' of https://github.com/flokuep/Vocaluxe into develop 2013-12-22 17:36:45 +01:00
Stephan Sundermann 4c188f1cc5 Lyrics: Fixed color when note is active 2013-12-22 17:06:47 +01:00
Stephan Sundermann 708d7f194b Lyrics: Fixed zoom animation 2013-12-22 16:51:49 +01:00
Florian Küpper 9fb9d70dc9 Fix name-selection and guest-profiles. 2013-12-22 10:09:32 +01:00
Florian Küpper 7ed949e955 Merge branch 'develop' of github.com:Vocaluxe/Vocaluxe into PartyNames 2013-12-22 09:27:56 +01:00
Stephan Sundermann abad5fca23 Added initial gstreamer-sharp audio backend (just a preview) 2013-12-22 01:02:30 +01:00
Florian Küpper 77f2e17d47 Revert "Revert PartyNames-changes on develop-branch." 
This reverts commit 43545ac47f.

Conflicts:
	VocaluxeLib/Menu/CNameSelection.cs
 2013-12-22 00:07:43 +01:00
lukeIam 055dc33675 Fix: HasFlag(EUserRole.TR_USERROLE_GUEST) does not work (workaround replaced it with !NORMAL) 2013-12-21 10:28:43 +01:00
Stephan Sundermann e0ecb0ed44 Fixed output directories 2013-12-19 13:19:42 +01:00
Florian Küpper 0c807862a8 Patch WebserverFlokuepDevelopTest 2013-12-19 09:02:40 +01:00
Florian Küpper 88a8d594ea Fixed flickering of bg-slideshow. 2013-12-19 08:54:30 +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 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 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
lukeIam 252ef113ce Webserver: -fix: used PasswordHash instead of PasswordSalt once 2013-12-13 18:03:21 +01:00
lukeIam ad717ea56e Webserver: -fix: problems setting the password and login 2013-12-13 18:03:20 +01:00
lukeIam 304529f396 Webserver: -fix: Password and Roles are not saved. 2013-12-13 18:03:19 +01:00
lukeIam 3126d5aaf0 User/Roles for webserver 2013-12-13 17:43:13 +01:00
lukeIam 28da5b776f WCF-Server inital commit (Wenserver without usermanagement and with some pages) 2013-12-13 17:34:07 +01:00
Flamefire dbcd79af79 Merge branch 'release-0.3' into develop 
Conflicts:
	VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs
 2013-10-19 02:12:29 +02:00
Flamefire 21f6213c1a Fix preview start after song end 2013-10-19 02:04:58 +02:00
Flamefire 83b72604a9 Remove confusing ActSongId 2013-10-19 02:02:53 +02:00
Flamefire 4c82446019 Bugfix on Init() function of song Menu 
Refactoring w/o functional changes
 2013-10-19 01:49:34 +02:00
Flamefire 73e4a9fa74 Merge branch 'release-0.3' into develop 
Conflicts:
	Vocaluxe/Base/CConfig.cs
	Vocaluxe/Lib/Playlist/CPlaylistFile.cs
	Vocaluxe/Screens/CScreenSong.cs
	VocaluxeLib/CHelper.cs
	VocaluxeLib/Menu/CMenu.cs
	VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs
	VocaluxeLib/Menu/SongMenu/CSongMenuTileBoard.cs
 2013-10-19 00:42:56 +02:00
Flamefire 02825cf46a Update preview only when necessary 2013-10-19 00:06:52 +02:00
Flamefire 3466c09851 Remove redundant code 2013-10-18 23:59:37 +02:00
Flamefire 03d92a474c Remove PreviewId pending stuff (don't need that. If you need a fade or something implement it properly with timer, event... But PreviewId should really be the current preview element) 2013-10-18 23:58:15 +02:00
Flamefire 60bd2c4da4 Rename PreviewSelected to more meaningful PreviewId 2013-10-18 23:50:47 +02:00
Flamefire 3a8acecd5c Use always the same xml writer settings 2013-10-18 23:40:23 +02:00
Flamefire 3b82d5c13c Fix for inconsistent song Menu 
Multiple refactoring due to ambiguous meanings
 2013-10-18 23:25:42 +02:00
Flamefire 155718456c Fix file-not-found exception 2013-10-18 21:29:43 +02:00
Flamefire 91afb830b5 Merge branch 'SongLoader' into develop 2013-10-14 22:02:18 +02:00
Flamefire 4e12e2624f Merge branch 'release-0.3' into develop 2013-10-14 22:02:02 +02:00
Flamefire 1702859e79 Write decimals in international format 
No warning on #RESOLUTION tag
 2013-10-14 21:55:26 +02:00
Flamefire d41779b6f2 Fix wrong comparisons 2013-10-13 00:27:03 +02:00
Flamefire 42ac648fc1 Remove txt on saved songs 
Detect also gif images automatically
 2013-10-12 23:10:11 +02:00
Flamefire 6e9db6ed98 Write correct tag 
No newline in LogError (could do it manually)
 2013-10-12 22:47:08 +02:00
Flamefire 6de23ea428 Use IsGameModeAvail for duet check 2013-10-12 21:50:39 +02:00
Flamefire b12e4156fa Allow #ENDSHORT tags 
Detect where Preview and ShortEnd came from
Introduce a function to check whether a given GameMode is available for a song
 2013-10-12 21:42:03 +02:00
Flamefire 87ba525811 Fix for SongWriter 2013-10-12 18:08:46 +02:00