Commit Graph
2441 Commits
Author SHA1 Message Date
Florian Küpper 4f35c9c583 Merge commit '8d3eb2c395c9e41d2feae3ca0a7b85defc396211' into develop 2015-04-01 14:08:20 +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
derivator 5da7887c1c Linux: add install target to makefile 2015-03-05 03:13:53 +01:00
derivator d7e0b24eec Linux: set AssemblyInformationalVersion to git version during build
just as windows builds do. Also set matchingServerVersion for the web app
and use the new format in CVocaluxeServer.
2015-03-04 22:53:44 +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
lukeIam 0f11a800f8 Fixed PS script for version injection into main.js 2015-03-04 21:26:51 +01:00
lukeIam 3c6dcb8c96 Merge branch 'develop' of https://github.com/Vocaluxe/Vocaluxe into develop 2015-03-04 10:37:18 +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
derivator acd89bc2d3 Linux: store config in ~/.config/Vocaluxe instead of in install dir
because we might not have permission to write there if installed as a package
If that folder doesn't exist, create it and copy the default profiles there,
so they show up but can still be edited or removed
2015-03-01 02:14:01 +01:00
derivator 1b86baa24d Linux: build for x86 if we're on x86 2015-03-01 00:34:00 +01:00
lukeIam 7aebfe5442 Removed unused usings from CGamePad 2015-02-28 18:44:25 +01:00
Florian Küpper b3b8a6ea2e Updated spanish translation. 2015-02-28 14:09:33 +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
lukeIam e48d719662 Added support for gamepads 2015-02-25 19:24:15 +01:00
lukeIam 43be49387a Removed the Wait call after RunSynchronously as it is not needed and causes an exception with Mono 2015-02-22 14:51:41 +01:00
lukeIam 5e58f4a1f8 Typo 2015-02-22 13:28:12 +01:00
lukeIam 86a98e7bf8 - Integration of the server into the main project
- Made the webserver calls threadsafe (with Tasks)
- Removed some old and unused server classes
2015-02-21 18:23:21 +01:00
derivator 413e7d7567 Fix graphical glitches on linux
.png textures using certain grayscale formats were loaded incorrectly, due to a defect in Mono's Bitmap class (see https://bugzilla.novell.com/show_bug.cgi?id=485773). Worked around by
converting these files to standard format.
2015-02-13 12:15:07 +01:00
derivator 5049ba5895 Make Vocaluxe buildable and playable on GNU/Linux
Build with MonoDevelop or make.
Summary of the biggest changes:

* Correct for case differences between System.Data.SQLite and
  Mono.Data.Sqlite
* Exclude Direct3D and DirectSound from linux builds
* Provide linux versions of some windows-specific build events
* Exclude VocaluxeTests from linux builds so xbuild will work
* Add ability to build the native PitchTracker on linux
* Fix some problems with acinerella module
* Fix some windows-specific dependency checks that fail on linux
* Set OpenGL color format to 24-bit on linux
2015-02-13 03:15:19 +01:00
Stephan Sundermann 2b9a38ff0d Merge pull request #138 from flokuep/develop
Small fix, new language.
2015-02-06 22:27:52 +01:00
Florian Küpper 336376a1af Fixed starting next bg-music-track. 2015-02-05 19:57:12 +01:00
Florian Küpper d94e7a5fde Added polish-server-translation. 2015-02-05 18:50:08 +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
lukeIam f60e0ac762 Merge branch 'develop' of https://github.com/Vocaluxe/Vocaluxe into develop
Conflicts:
	Vocaluxe/Vocaluxe.csproj
2015-01-18 20:56:55 +01:00
lukeIam dc4016a882 PostBuild code format fixed 2015-01-18 20:48:19 +01:00
lukeIam 0f5040d669 [App] - The app stores the Vocaluxe version it was created with
[Server] -getServerVersion added
[App] - Checks if the server has the right version, otherwise fallback to inApp WebVersion
2015-01-18 20:44:47 +01:00
Stephan Sundermann 846e20e24a Merge pull request #136 from lukeIam/develop
Serverlib build path
2015-01-17 19:29:33 +01:00
lukeIam a9b5334f3f Changed ServerLib's assembly name from ClientServerLib to ServerLib as there is no client code anymore 2015-01-17 18:29:26 +01:00
lukeIam bd2f545220 Fix: ServerLib build folder is wrong 2015-01-17 17:31:09 +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
Florian Küpper f03cd930d2 Fix: Copy new languages into right folder. 2015-01-17 14:11:52 +01:00
Stephan Sundermann 9f1e120e10 Merge pull request #134 from flokuep/develop
Fixes and language-update.
2015-01-16 21:38:14 +01:00
Florian Küpper 43a8d4c8c2 Updated languages, new language:Portuguese, thanks to translators. 2015-01-16 20:48:43 +01:00
Florian Küpper 94539bbf92 Fixed bg-music glitches. 2015-01-16 17:32:32 +01:00
Florian Küpper 247bff132b Added BackgroundPreview as music source 2015-01-16 17:29:22 +01:00
Florian Küpper 4963431c19 Updated language-files. 2015-01-09 15:57:43 +01:00
Florian Küpper 0e02adba2d Updated language-files. 2015-01-04 11:16:30 +01:00
Stephan Sundermann 6e96fb6421 Merge pull request #133 from flokuep/develop
Fixes and improvements
2015-01-03 16:31:02 +01:00
Florian Küpper b11e40b313 Fix video-preview in song-screen. 2015-01-03 14:53:38 +01:00
Florian Küpper ff05fc57cc Increase version of party-mode-system. 2015-01-03 14:33:14 +01:00
Florian Küpper cf6ff3c133 Added options for number of songs and song-source to challenge-medley. 2015-01-03 14:29:35 +01:00
Florian Küpper dddb1206b3 Fix nullpointer-exception and bg-music behaviour. 2015-01-03 12:49:24 +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
Flamefire be8fb53ecc Don't ignore Medley Tags 2014-12-31 18:40:34 +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
lukeIam a0e1f6d558 [Server] Send better messages on failed playlist operations 2014-12-31 13:39:18 +01:00
lukeIam 83fee9dc06 [Server] small change on request() 2014-12-31 13:26:53 +01:00
lukeIam dd470dcd66 Added comment with wcf tracing code 2014-12-31 13:26:28 +01:00