Florian Küpper
9dac4d4fa5
Merge branch 'develop' of github.com:Vocaluxe/Vocaluxe into develop
2013-12-22 10:16:05 +01:00
Florian Küpper
9fb9d70dc9
Fix name-selection and guest-profiles.
2013-12-22 10:09:32 +01:00
Florian Küpper
6704344205
Disable resetting after pause, isn't ready yet.
2013-12-22 10:03:08 +01:00
Stephan Sundermann
ec0308cac2
Improved gstreamer-sharp audio backend
...
Should be fully functional now, I still need to check the difference between stopping and closing a stream. I think close will free all resources and finalize the stream, whilst stop is supposed to set the position to 0 so that the stream can be recovered. But in this case FadeAndStop should be renamed to FadeAndClose because currently in all cases where FadeAndStop is called the stream should be closed instead of being stopped.
2013-12-22 04:01:56 +01:00
Alexander Eckart
25cccfdeaf
Bugfix: Crash when starting duet songs.
...
Please TEST, TEST and TEST before commit! It can't be that this branch contains such silly bugs!
2013-12-22 02:14:11 +01:00
Stephan Sundermann
abad5fca23
Added initial gstreamer-sharp audio backend (just a preview)
2013-12-22 01:02:30 +01:00
Stephan Sundermann
f8012e339f
Merge pull request #88 from flokuep/develop
...
Small bugfixes
2013-12-21 14:49:39 -08:00
Florian Küpper
6009826e02
Merge branch 'develop' of github.com:lukeIam/Vocaluxe into develop
2013-12-21 23:47:43 +01:00
Florian Küpper
4d72d43c0a
Fixes #87 - Crash without songs.
2013-12-21 23:46:01 +01:00
Florian Küpper
43545ac47f
Revert PartyNames-changes on develop-branch.
2013-12-21 23:40:23 +01:00
Florian Küpper
bd1918666c
PlayerNames: Change player/team-num on NamesScreen. TODO: Theme-stuff and remove options from config screen.
2013-12-21 23:38:06 +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
Florian Küpper
e32320ffca
PartyNames: Added visual feedback for max-player-num.
2013-12-20 16:56:52 +01:00
Florian Küpper
ce8f03d32f
PartyNames: Some theme-adjustments.
2013-12-20 16:02:45 +01:00
Florian Küpper
3b7db42a89
PartyNames: Added support for no teams.
2013-12-20 15:57:02 +01:00
Florian Küpper
007999999e
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-20 15:27:18 +01:00
Florian Küpper
3c48e9607f
Some additions to select-slides.
2013-12-20 14:31:46 +01:00
Stephan Sundermann
e45dc4d8a9
Lower platformtoolset
2013-12-19 13:51:13 +01:00
Stephan Sundermann
69fd0aff51
Build ServerLib and WebserverConfig in x86
2013-12-19 13:48:50 +01:00
Stephan Sundermann
ea157fe04c
Fixed ClientServerLib output path
2013-12-19 13:40:40 +01:00
Stephan Sundermann
1a1234978a
Fixed Newtonsoft.Json reference
2013-12-19 13:37:36 +01:00
Stephan Sundermann
e0ecb0ed44
Fixed output directories
2013-12-19 13:19:42 +01:00
Stephan Sundermann
90e2d50a5d
Merge pull request #86 from flokuep/develop
...
Webserver UI Additions
2013-12-19 03:22:46 -08:00
Florian Küpper
08ddb4ba63
Merge branch 'develop' of github.com:flokuep/Vocaluxe into develop
...
Conflicts:
VocaluxeLib/Menu/CBackground.cs
2013-12-19 09:04: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
Stephan Sundermann
355fa08599
Merge pull request #84 from lukeIam/WSRebaseTry
...
Webserver and App
2013-12-16 11:45:36 -08:00
Florian Küpper
124d7d0bf4
Make random a bit less random, but already sung songs shouldn't be suggested frequently.
2013-12-15 12:27:09 +01:00
lukeIam
fc35885425
- Fixed rebase/merge errors
2013-12-13 18:26:47 +01:00
lukeIam
fc0fad5248
-Correct line endings 2
2013-12-13 18:05:38 +01:00
lukeIam
b4aa459f9a
Fixed line endings
2013-12-13 18:03:24 +01:00
lukeIam
14835e2e24
Webserver: -mod: translations are now in external json files
2013-12-13 18:03:23 +01:00
lukeIam
d4552d5860
Webserver: -mod: removed send char funktion from app
...
-mod: little style fix
2013-12-13 18:03:22 +01:00
lukeIam
cdcd3d201f
Webserver: -fix: new profile config files were created instead og using the old ones
2013-12-13 18:03:22 +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
60a8c59b7d
Webserver: -mod: also use cacheing headers for other resources
2013-12-13 18:03:18 +01:00
Florian Küpper