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
1713 Commits
This Branch
This Branch
All Branches
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
Stephan Sundermann 9d73d6b532 Merge branch 'develop' of https://github.com/flokuep/Vocaluxe into develop 2013-12-23 01:11:44 +01:00
Stephan Sundermann 4cd7b687ac gstreamer-sharp: code cleanup 2013-12-23 01:08:29 +01:00
Stephan Sundermann d3a3e7471f gstreamer-sharp: Downgrade to gstreamer 1.0.10 
Gstreamer 1.2.1 has a bug where multiple calls to query_duration/position would block the pipeline until the information is available.
 2013-12-23 00:44:11 +01:00
Florian Küpper edf506ef6e Fixed aspect-ration from webcam-texture (video-options) 2013-12-22 23:32:20 +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 47006e7d8f Reset border adjustments with STRG + ALT + SHIFT + 0 2013-12-22 22:48:00 +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
Florian Küpper 99b7c325e8 Fix debug hit. 2013-12-22 18:15:12 +01:00
Florian Küpper 2548c3a1f9 Added DEBUG_HIT option again. 2013-12-22 17:53:51 +01:00
Alexander Eckart f4fca4d798 Merge branch 'develop' of https://github.com/Vocaluxe/Vocaluxe into develop 2013-12-22 17:43:12 +01:00
Alexander Eckart 76ffad20fd added border adjustment (ctrl+alt+shift + left/right). some tvs have borders which can't be deactivated. 2013-12-22 17:43:03 +01:00
Florian Küpper b6f412ba45 Merge branch 'develop' of github.com:Vocaluxe/Vocaluxe into develop 2013-12-22 17:42:44 +01:00
Alexander Eckart 18c1b3bd03 take the first network ip. how can we be sure that this one is the right one? 2013-12-22 17:40:17 +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 d26fad858d gstreamer-sharp: Let the GC dispose old elements 2013-12-22 17:25:49 +01:00
Stephan Sundermann cc1faefc38 Only enable messagebox exception handling in release mode 
Debug builds are meant to be executed in a IDE environment, so it is better to take advantage of the IDE's features to show where the exception came from.
 2013-12-22 17:25:31 +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
Stephan Sundermann 028eda099a Playback: Added FadeAndStop 2013-12-22 16:29:44 +01:00
Stephan Sundermann a2f626fbca gstreamer-sharp: Fixed fading 2013-12-22 16:19:42 +01:00
Stephan Sundermann c5c4fb856f gstreamer-sharp: Better error handling 2013-12-22 15:33:41 +01:00
Stephan Sundermann 95efc8bc08 Renamed FadeAndStop to FadeAndClose 
gstreamer-sharp: Fixed SetMaxVolume
gstreamer-sharp: Streams now close properly
 2013-12-22 15:12:59 +01:00
Florian Küpper ba305c1773 Merge branch 'develop' of github.com:Vocaluxe/Vocaluxe into develop 2013-12-22 14:57:15 +01:00
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
Florian Küpper 7ed949e955 Merge branch 'develop' of github.com:Vocaluxe/Vocaluxe into PartyNames 2013-12-22 09:27:56 +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
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
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