Projects/Vocaluxe
2
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,707 Commits 7 Branches 7 Tags
develop
Commit Graph
3707 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
lukeIam 341f03714e Fix: HasFlag(EUserRole.TR_USERROLE_GUEST) does not work (workaround replaced it with !NORMAL) 2013-12-26 13:02:01 +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
Stephan Sundermann 56eab7b165 Lower platformtoolset 2013-12-26 13:01:57 +01:00
Stephan Sundermann 45030e13fd Build ServerLib and WebserverConfig in x86 2013-12-26 13:01:57 +01:00
Stephan Sundermann 79d8ffd51e Fixed ClientServerLib output path 2013-12-26 13:01:56 +01:00
Stephan Sundermann 5fd7236ce8 Fixed Newtonsoft.Json reference 2013-12-26 13:01:56 +01:00
Stephan Sundermann 2a8d1fb486 Fixed output directories 2013-12-26 13:01:55 +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 f67ca8c800 PartyNames: Use [+] and [-] to in/decrease player/team-num. 2013-12-26 12:47:32 +01:00
Florian Küpper 9e92ec2b99 PartyNames: Fix random selection. 2013-12-26 12:44:19 +01:00
Florian Küpper f9d2d952a8 PartyNames: Use screen for ChallengeMedley 2013-12-26 12:44:02 +01:00
Florian Küpper 6bb112b574 PartyNames: Fix name-selection. 2013-12-26 12:17:53 +01:00
Florian Küpper a6a6334dac PartyNames: Workaround for right size of select-slide-textures. Anyone better ideas? 2013-12-26 12:16:50 +01:00
Florian Küpper cbae1407f2 PartyNames: Use [1]..[9] to change team and/or increase team-num. 2013-12-26 11:58:26 +01:00
Florian Küpper b56a7f572b PartyNames: Some cleanup 2013-12-26 11:44:36 +01:00
Florian Küpper 4b4c8aa8f2 PartyNames: Added button for selecting random. 2013-12-26 11:37:19 +01:00
Florian Küpper 2427f40bc6 Merge branch 'develop' of github.com:Vocaluxe/Vocaluxe into PartyNames 2013-12-26 11:21:23 +01:00
Florian Küpper 67cbba5604 Merge branch 'develop' of github.com:Vocaluxe/Vocaluxe into develop 2013-12-26 11:19:26 +01:00
Stephan Sundermann 06a63760b9 SlimDX: Updated libraries and removed library documentation files 2013-12-25 14:15:06 +01:00
Stephan Sundermann 4d52cf8263 Bugfix: Fixed NullReferenceException when search returned 0 results 2013-12-25 10:39:15 +01:00
Stephan Sundermann 4e132f5b1f Merge pull request #89 from lukeIam/develop 
Fixed user rights bug
 2013-12-24 03:50:32 -08:00
Florian Küpper cc2969cc31 Just another fix for name-selection. 2013-12-23 14:47:19 +01:00
Florian Küpper c118de8353 PartyNames: Could change team/player-nums on name-selection now if allowed. 2013-12-23 14:41:29 +01:00
Florian Küpper 3f0509c5af Another fix for name-selection. 2013-12-23 14:34:55 +01:00
Alexander Eckart d9b8d54eb9 Use hostname instead of the ip. 2013-12-23 11:46:03 +01:00
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
lukeIam a46bb23f19 Fixed user rights bug 2013-12-22 20:14:57 +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