Projects/Vocaluxe
2
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,985 Commits 7 Branches 7 Tags
235ce266e53ad86c5da170a78b6fe20d0993f4f6
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Küpper 7bf11363fe Fixes #96 - Also added message if server is not running. 2014-02-18 12:41:50 +01:00
Florian Küpper 70f566682f Fix short-song-mode. 2014-01-21 19:19:04 +01:00
Florian Küpper 9676c1056f Prohibit screen-saver and disabling monitor when vocaluxe is running. 2014-01-21 19:09:29 +01:00
Florian Küpper 5277504e34 Fix forgetting last song after singing. 2013-12-31 15:41:28 +01:00
Florian Küpper 388a5b4078 Merge branch 'develop' of github.com:lukeIam/Vocaluxe into develop 2013-12-31 13:51:02 +01:00
Florian Küpper 8e967dce4e Merge branch 'develop' of github.com:Vocaluxe/Vocaluxe into develop 2013-12-31 13:49:01 +01:00
Florian Küpper 599b671ffa Merge branch 'develop' of github.com:lukeIam/Vocaluxe into develop 2013-12-31 12:41:15 +01:00
Florian Küpper 82180d96fc Fixed typos. Sorry. 2013-12-31 12:27:18 +01:00
Florian Küpper b433576de0 PartyNames: Fix 'remembering' of selected profiles. 2013-12-31 11:26:26 +01:00
Florian Küpper 3e91ad499d Fix: Webserver locales. 2013-12-31 11:12:59 +01:00
Florian Küpper ca22ca1719 Language-update. 2013-12-31 11:01:29 +01:00
Florian Küpper 00fb8079e6 Fixed webcam-bug. 2013-12-31 10:36:11 +01:00
Florian Küpper 1d3b238dab Merge branch 'develop' of github.com:Vocaluxe/Vocaluxe into develop 2013-12-26 14:30:35 +01:00
Florian Küpper 97abd86661 update .gitignore 2013-12-26 13:44:15 +01:00
Florian Küpper 1db5268b0a Merge branch 'PartyNames' of github.com:flokuep/Vocaluxe into PartyNames 2013-12-26 13:08:49 +01:00
Florian Küpper 978c04916b PartyNames: Use [+] and [-] to in/decrease player/team-num. 2013-12-26 13:07:31 +01:00
Florian Küpper 0f1beb6479 PartyNames: Fix random selection. 2013-12-26 13:07:31 +01:00
Florian Küpper 2f17bfe3b1 PartyNames: Use screen for ChallengeMedley 2013-12-26 13:07:30 +01:00
Florian Küpper 94f8dcef3c PartyNames: Fix name-selection. 2013-12-26 13:07:30 +01:00
Florian Küpper 11df1dd0ad PartyNames: Workaround for right size of select-slide-textures. Anyone better ideas? 2013-12-26 13:07:29 +01:00
Florian Küpper c14ea466f5 PartyNames: Use [1]..[9] to change team and/or increase team-num. 2013-12-26 13:07:29 +01:00
Florian Küpper 4f08a7a796 PartyNames: Some cleanup 2013-12-26 13:07:28 +01:00
Florian Küpper 915db881e3 PartyNames: Added button for selecting random. 2013-12-26 13:07:28 +01:00
Florian Küpper 3f28d6405c PartyNames: Could change team/player-nums on name-selection now if allowed. 2013-12-26 13:07:23 +01:00
Florian Küpper f5407f1815 Another fix for name-selection. 2013-12-26 13:07:22 +01:00
Florian Küpper 774fd7f7a5 Fixed aspect-ration from webcam-texture (video-options) 2013-12-26 13:06:29 +01:00
Florian Küpper 69da81ecac Added screen for screen-adjustments. 2013-12-26 13:06:27 +01:00
Florian Küpper 170f7d2d3e Reset border adjustments with STRG + ALT + SHIFT + 0 2013-12-26 13:06:26 +01:00
Florian Küpper 8de95ffee0 Just a comment-fix 2013-12-26 13:06:24 +01:00
Florian Küpper dde4ef951c Added DEBUG_HIT option again. 2013-12-26 13:06:21 +01:00
Florian Küpper f745298fcb Fix name-selection and guest-profiles. 2013-12-26 13:04:38 +01:00
Florian Küpper f5dffdf178 Disable resetting after pause, isn't ready yet. 2013-12-26 13:03:26 +01:00
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
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
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
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
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 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
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
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
Florian Küpper b6f412ba45 Merge branch 'develop' of github.com:Vocaluxe/Vocaluxe into develop 2013-12-22 17:42:44 +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
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
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
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
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
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
Florian Küpper c5638a08d1 Rename a variable. 2013-10-29 10:13:17 +01:00
Florian Küpper 88344ec8b4 #BACKGROUND-Tag could be multiple now, when there are more than one bgs, a slide-show will shown in ScreenSing. 2013-10-26 15:17:14 +02:00
Florian Küpper 8a638d8e9a Added new background-option: SlideShow. 2013-10-26 14:36:26 +02:00