Commit Graph
1818 Commits
Author SHA1 Message Date
Flamefire 8b1b44ad49 Refactoring to make names conistent and remove warnings 2014-02-15 13:08:24 +01:00
Flamefire ff8fa48f3c Fix warnings 2014-02-15 12:40:16 +01:00
Flamefire f3c713416c Use autopropertys in server 2014-02-15 12:38:31 +01:00
Flamefire b8629c1a74 Update gitignore 2014-02-15 12:36:07 +01:00
Flamefire 381b2aeee6 Fix ServerConfig project 2014-02-15 12:35:09 +01:00
Flamefire 43a82e95d7 Fix typo in languages 2014-02-15 12:11:48 +01:00
Stephan Sundermann 7dcb160e13 Merge pull request #95 from flokuep/develop
Smaller fixes and additions
2014-01-21 13:06:22 -08: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
Stephan Sundermann bf97a60327 Merge pull request #94 from lukeIam/develop
Added a "p"-button to the apps keyboard (required for selecting player)
2014-01-14 11:35:58 -08:00
lukeIam 59b8fb5406 Add: Added a "p"-button to the apps keyboard (required for selecting a player) 2014-01-14 19:04:22 +01:00
Florian Küpper 5277504e34 Fix forgetting last song after singing. 2013-12-31 15:41:28 +01:00
Stephan Sundermann 8f5a190ce9 Merge pull request #93 from lukeIam/develop
Maybe a fix for VocaluxeServerConfig bug
2013-12-31 05:54:10 -08: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
lukeIam 6b446cff9f Maybe a fix for VocaluxeServerConfig bug 2013-12-31 13:38:23 +01:00
Stephan Sundermann 7c58cdaae8 Merge pull request #92 from lukeIam/develop
ServerLib config fix and a bugfix for the VocaluxeServerConfig.exe
2013-12-31 04:26:38 -08:00
lukeIam 51446fa5c4 -Fix: Config exe does check for wrong parameters but does not terminate on wrong parameters. 2013-12-31 13:04:06 +01:00
Stephan Sundermann 541d107e7c Merge pull request #91 from flokuep/develop
Fixed typos. Sorry.
2013-12-31 03:49:31 -08:00
Florian Küpper 599b671ffa Merge branch 'develop' of github.com:lukeIam/Vocaluxe into develop 2013-12-31 12:41:15 +01:00
lukeIam d0c41ff1fb -Fix: ServerLib has only Release and Debug configs(and no WIND/LINUX flags) 2013-12-31 12:38:23 +01:00
Florian Küpper 82180d96fc Fixed typos. Sorry. 2013-12-31 12:27:18 +01:00
Stephan Sundermann d6605effcf Merge pull request #90 from flokuep/develop
Some bugfixes/updates
2013-12-31 03:09:20 -08: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
Stephan Sundermann 3aad13dbbe Merge branch 'PartyNames' of https://github.com/flokuep/Vocaluxe into develop 2013-12-26 15:25:01 +01:00
Stephan Sundermann 39c7c1ed1c gstreamer-sharp: Use CLOCK_TIME_NONE until ASYNC_DONE 2013-12-26 15:23:43 +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
Stephan Sundermann 949ef022dc SlimDX: Updated libraries and removed library documentation files 2013-12-26 13:07:26 +01:00
Stephan Sundermann f5d3358b5f Bugfix: Fixed NullReferenceException when search returned 0 results 2013-12-26 13:07:25 +01:00
lukeIam f2b30d0952 Fixed user rights bug 2013-12-26 13:07:25 +01:00
Alexander Eckart d24551459f Use hostname instead of the ip. 2013-12-26 13:07:23 +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