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
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Stephan Sundermann 0e2ef9d347 Merge pull request #160 from lukeIam/fixedDuetParsing 
Fixed duet parsing (closes #159)
 2015-11-28 15:52:46 +01:00
Stephan Sundermann ce6f1c1d64 Merge pull request #158 from lukeIam/PlaylistControlsBroken 
Fix: Playlist controls are broken
 2015-10-15 19:49:19 +02:00
Stephan Sundermann 15e28c8a8f Merge pull request #155 from Shiroi/develop 
PartyMode Challenge: Added an option to not refill jokers after every…
 2015-08-26 17:01:14 +02:00
Stephan Sundermann d7b358974e Merge pull request #154 from Shiroi/develop 
PartyMode Challenge: Made the amount of jokers configurable
 2015-08-13 12:08:49 +02:00
Stephan Sundermann d96759555a Merge pull request #150 from flokuep/develop 
Some fixes and additions.
 2015-04-02 15:08:11 +02:00
Stephan Sundermann 8d3eb2c395 Merge pull request #145 from derivator/linux-fixes 
Linux: set AssemblyInformationalVersion to git version and add install target to makefile
 2015-03-05 22:12:29 +01:00
Stephan Sundermann 0371aebc43 Merge pull request #142 from lukeIam/develop 
Fixed PS script + Removed unused usings from CGamePad
 2015-03-04 21:34:12 +01:00
Stephan Sundermann fb8dbb3a04 Merge pull request #143 from derivator/linux-fixes 
Linux: enable building on x86 and prepare for packaging
 2015-03-01 03:15:32 +01:00
Stephan Sundermann 13f72c3cad Merge pull request #141 from lukeIam/integratedServer 
Integrated server
 2015-02-26 18:58:56 +01:00
Stephan Sundermann e100101ce4 Merge pull request #139 from derivator/linux-update 
Make Vocaluxe buildable and playable on GNU/Linux
 2015-02-26 11:13:18 +01:00
Stephan Sundermann cbc1bdd3c0 Merge pull request #140 from lukeIam/GamePad 
Added support for gamepads
 2015-02-26 10:20:43 +01:00
Stephan Sundermann 2b9a38ff0d Merge pull request #138 from flokuep/develop 
Small fix, new language.
 2015-02-06 22:27:52 +01:00
Stephan Sundermann e8e4c3b1b8 Merge pull request #137 from lukeIam/develop 
Check if the app fits to the server version
 2015-01-18 21:02:21 +01:00
Stephan Sundermann 846e20e24a Merge pull request #136 from lukeIam/develop 
Serverlib build path
 2015-01-17 19:29:33 +01:00
Stephan Sundermann 3ccce93068 Merge pull request #135 from flokuep/develop 
Fix: Copy new languages into right folder.
 2015-01-17 15:09:48 +01:00
Stephan Sundermann 9f1e120e10 Merge pull request #134 from flokuep/develop 
Fixes and language-update.
 2015-01-16 21:38:14 +01:00
Stephan Sundermann 6e96fb6421 Merge pull request #133 from flokuep/develop 
Fixes and improvements
 2015-01-03 16:31:02 +01:00
Stephan Sundermann be51ba450b Merge pull request #132 from Flamefire/develop 
Don't ignore Medley Tags
 2014-12-31 18:42:01 +01:00
Stephan Sundermann f24acd7372 Merge pull request #131 from lukeIam/develop 
Fixed: Bad request on some playlist operations
 2014-12-31 14:59:24 +01:00
Stephan Sundermann 4d494fe185 Merge pull request #130 from lukeIam/develop 
[Server] multiple logins per user + mp3 stream
 2014-12-30 19:06:40 +01:00
Stephan Sundermann 3f2a794952 Merge pull request #129 from Flamefire/develop 
Develop
 2014-12-27 13:26:23 +01:00
Stephan Sundermann fadfb497e8 Webcam: Remove OpenCV configs 2014-12-23 14:55:17 +01:00
Stephan Sundermann ccf8d61f5a Fix typo 2014-12-23 00:39:52 +01:00
Stephan Sundermann ddcc5d1a49 Merge pull request #127 from Flamefire/develop 
Develop
 2014-12-21 14:21:07 +01:00
Stephan Sundermann 76859942b8 Merge pull request #126 from flokuep/develop 
Some minor fixes.
 2014-12-19 18:38:23 +01:00
Stephan Sundermann 3d088fa407 Merge pull request #125 from Flamefire/develop 
Develop
 2014-12-17 22:10:40 +01:00
Stephan Sundermann 76d4de1cc2 Merge pull request #124 from flokuep/develop 
Added translators to credits. It's now easy to add new translators/langu...
 2014-12-13 11:52:01 +01:00
Stephan Sundermann 18bdb7aa05 Merge pull request #123 from Flamefire/develop 
Bugfixes
 2014-12-07 23:53:55 +01:00
Stephan Sundermann b33cf54f1e Merge pull request #122 from flokuep/develop 
Some fixes
 2014-12-05 19:13:41 +01:00
Stephan Sundermann 5580210632 Merge pull request #121 from flokuep/develop 
Smaller improvements
 2014-12-04 17:22:35 +01:00
Stephan Sundermann d9f677cbc4 Merge pull request #118 from Flamefire/develop 
Develop
 2014-12-03 22:19:14 +01:00
Stephan Sundermann ade556c8ae Merge pull request #120 from flokuep/develop 
Fixed starting server and creating profiles.
 2014-12-03 11:14:40 +01:00
Stephan Sundermann 9990ede3ca Merge pull request #119 from flokuep/develop 
Some fixes on names-screen.
 2014-12-02 23:46:23 +01:00
Stephan Sundermann 558b6ed218 Merge pull request #117 from flokuep/develop 
Added cover-theme, updated language-files
 2014-12-02 22:14:30 +01:00
Stephan Sundermann 417de86984 Merge pull request #116 from flokuep/develop 
Some fixes and improvements.
 2014-12-01 15:41:32 +01:00
Stephan Sundermann 7044d8a084 Merge pull request #115 from Flamefire/develop 
Develop
 2014-11-29 19:37:17 +01:00
Stephan Sundermann db208cbbec Merge pull request #114 from Flamefire/develop 
Handle missing/empty config
 2014-11-24 22:24:52 +01:00
Stephan Sundermann f1645d22a2 Merge pull request #113 from flokuep/develop 
some fixes
 2014-11-23 22:23:08 +01:00
Stephan Sundermann 0dd7c039f0 Merge pull request #112 from lukeIam/develop 
Fix: remote app can't show own profile under some circumstances
 2014-11-21 19:22:12 +01:00
Stephan Sundermann fda418c6dd Merge pull request #111 from Flamefire/develop 
Develop
 2014-11-19 23:33:16 +01:00
Stephan Sundermann 5f037e6cf3 Merge pull request #110 from lukeIam/develop 
New features for the remote keyboard and some JS fixes
 2014-11-13 00:24:55 +01:00
Stephan Sundermann 207f1a02f0 Include git hash in version 2014-11-12 00:11:26 +01:00
Stephan Sundermann a8371303c8 Merge pull request #109 from lukeIam/develop 
Added a simple windows build howto
 2014-11-11 20:59:32 +01:00
Stephan Sundermann e377f75f1d Merge pull request #108 from lukeIam/develop 
Refactoring of the JS App part
 2014-11-10 11:54:10 +01:00
Stephan Sundermann 76f5ac93bb Update gstreamer-sharp to 1.4 
Removed all native gstreamer libraries from the gstreamer directory. The implementation reads the environment variables from the gstreamer packages to add the gstreamer binaries to the PATH.
The installer can embed the merge module files from gstreamer.
 2014-09-20 01:38:47 +02:00
Stephan Sundermann 1a94f3a6f8 Merge pull request #103 from flokuep/develop 
sound/song-player
 2014-09-13 19:34:54 +02:00
Stephan Sundermann b279ee74cb Merge pull request #102 from flokuep/develop 
Some minor improvements
 2014-08-07 00:44:41 +02:00
Stephan Sundermann b3f284c476 Merge pull request #101 from Flamefire/develop 
Fix wrong initial language selection
 2014-05-10 13:29:16 +02:00
Stephan Sundermann c62cebaf66 Release Vocaluxe 0.3.0 Beta build 83 
0.3.0 is not yet released and last release was build 83
 2014-05-10 14:43:40 +02:00
Stephan Sundermann d580e817f9 Merge pull request #100 from Flamefire/develop 
Develop
 2014-05-10 12:33:30 +02:00
Stephan Sundermann de6045c249 Merge pull request #99 from Flamefire/develop 
Develop
 2014-03-14 19:47:46 +01:00
Stephan Sundermann aad3c8147f Merge pull request #98 from Flamefire/develop 
Develop
 2014-02-26 01:12:03 +01:00
Stephan Sundermann 722a3279d5 Merge pull request #97 from flokuep/develop 
Fixes #96 - Also added message if server is not running.
 2014-02-18 13:43:55 +01:00
Stephan Sundermann 7dcb160e13 Merge pull request #95 from flokuep/develop 
Smaller fixes and additions
 2014-01-21 13:06:22 -08: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
Stephan Sundermann 8f5a190ce9 Merge pull request #93 from lukeIam/develop 
Maybe a fix for VocaluxeServerConfig bug
 2013-12-31 05:54:10 -08: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
Stephan Sundermann 541d107e7c Merge pull request #91 from flokuep/develop 
Fixed typos. Sorry.
 2013-12-31 03:49:31 -08:00
Stephan Sundermann d6605effcf Merge pull request #90 from flokuep/develop 
Some bugfixes/updates
 2013-12-31 03:09:20 -08: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
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
Stephan Sundermann eb54ccf5a8 gstreamer-sharp: code cleanup 2013-12-26 13:05:33 +01:00
Stephan Sundermann 161e255367 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-26 13:04:52 +01:00
Stephan Sundermann fe2fbd7656 gstreamer-sharp: Query duration async 2013-12-26 13:04:40 +01:00
Stephan Sundermann 1cc59ec584 gstreamer-sharp: Let the GC dispose old elements 2013-12-26 13:03:25 +01:00
Stephan Sundermann bcd4af2f96 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-26 13:03:24 +01:00
Stephan Sundermann 680351a452 Lyrics: Fixed color when note is active 2013-12-26 13:03:24 +01:00
Stephan Sundermann 26c8e02c1c Lyrics: Fixed zoom animation 2013-12-26 13:03:23 +01:00
Stephan Sundermann 257eda3e0f Playback: Added FadeAndStop 2013-12-26 13:03:22 +01:00
Stephan Sundermann 56036b6f1d gstreamer-sharp: Fixed fading 2013-12-26 13:03:22 +01:00
Stephan Sundermann deabae991a gstreamer-sharp: Better error handling 2013-12-26 13:03:20 +01:00
Stephan Sundermann ca8fe42a30 Renamed FadeAndStop to FadeAndClose 
gstreamer-sharp: Fixed SetMaxVolume
gstreamer-sharp: Streams now close properly
 2013-12-26 13:03:20 +01:00
Stephan Sundermann 9fb65de572 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-26 13:03:14 +01:00
Stephan Sundermann 8854bcd6ac Added initial gstreamer-sharp audio backend (just a preview) 2013-12-26 13:02:25 +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
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
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
Stephan Sundermann 5bac5e98bf gstreamer-sharp: Query duration async 2013-12-22 22:26:10 +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
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
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